X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;f=go%2Fr3-netstatus%2Fmain.go;h=143f62b30a3b66b7e5c0f2c66d4e44909dfca380;hb=2c075d279f61bf548e22b2715d82d58fc1f16f76;hp=7841399a6120f51b5955ba075571dffa1f9fbe95;hpb=0eff4b5b15229a5efe0088de99b1b1ea59f8ad7a;p=svn42.git diff --git a/go/r3-netstatus/main.go b/go/r3-netstatus/main.go index 7841399..143f62b 100644 --- a/go/r3-netstatus/main.go +++ b/go/r3-netstatus/main.go @@ -10,6 +10,7 @@ import ( "fmt" //~ "./brain" r3events "svn.spreadspace.org/realraum/go.svn/r3events" + zmq "github.com/vaughan0/go-zmq" ) type SpaceState struct { @@ -20,7 +21,6 @@ type SpaceState struct { } var ( - xmpp_presence_events_chan_ chan interface{} xmpp_login_ struct {jid string; pass string} xmpp_bot_authstring_ string xmpp_state_save_dir_ string @@ -30,6 +30,8 @@ var ( enable_syslog_, enable_debug_ bool ) +type EventToXMPPStartupFinished struct{} + //------- func init() { @@ -37,8 +39,8 @@ func init() { flag.StringVar(&xmpp_login_.pass, "xpass", "", "XMPP Bot Login Password") flag.StringVar(&xmpp_bot_authstring_, "xbotauth", "", "String that user use to authenticate themselves to the bot") flag.StringVar(&xmpp_state_save_dir_,"xstatedir","/flash/var/lib/r3netstatus/", "Directory to save XMPP bot state in") - flag.StringVar(&r3eventssub_port_, "eventsubport", "tcp://wuzzler.realraum.at:4244", "zmq address to subscribe r3events") - flag.StringVar(&brain_connect_addr_, "brainconnect", "tcp://wuzzler.realraum.at:4245", "address to ask about most recent stored events") + flag.StringVar(&r3eventssub_port_, "eventsubport", "tcp://torwaechter.realraum.at:4244", "zmq address to subscribe r3events") + flag.StringVar(&brain_connect_addr_, "brainconnect", "tcp://torwaechter.realraum.at:4245", "address to ask about most recent stored events") flag.BoolVar(&enable_syslog_, "syslog", false, "enable logging to syslog") flag.BoolVar(&enable_debug_, "debug", false, "enable debug output") flag.Parse() @@ -50,9 +52,9 @@ func IfThenElseStr(c bool, strue, sfalse string) string { if c {return strue} else {return sfalse} } -func composeDoorLockMessage(locked, frontshut bool, doorcmd r3events.DoorCommandEvent, ts int64) string { +func composeDoorLockMessage(locked bool, frontshut r3events.DoorAjarUpdate, doorcmd r3events.DoorCommandEvent, ts int64) string { var ajarstring string = ""; - if ! frontshut { + if frontshut.Shut == false && frontshut.Ts < doorcmd.Ts { ajarstring = " (still ajar)" } if ts - doorcmd.Ts < 30 { @@ -66,65 +68,112 @@ func composeDoorLockMessage(locked, frontshut bool, doorcmd r3events.DoorCommand } } -func EventToXMPP(ps *pubsub.PubSub, xmpp_presence_events_chan_ chan <- interface{}) { - events := ps.Sub("presence","door","buttons","updateinterval") +func composePresence(present bool, temp_cx float64, light_lothr, last_buttonpress int64) r3xmppbot.XMPPStatusEvent { + present_msg := "Somebody is present" + notpresent_msg := "Nobody is here" + button_msg := "The button has been pressed :-)" + msg := "%s (CX: %.2f°C, LoTHR light: %d)" + + if present { + if last_buttonpress > 0 && time.Now().Unix() - last_buttonpress < button_press_timeout_ { + return r3xmppbot.XMPPStatusEvent{r3xmppbot.ShowFreeForChat, fmt.Sprintf(msg, button_msg, temp_cx, light_lothr)} + } else { + return r3xmppbot.XMPPStatusEvent{r3xmppbot.ShowOnline, fmt.Sprintf(msg, present_msg, temp_cx, light_lothr)} + } + } else { + return r3xmppbot.XMPPStatusEvent{r3xmppbot.ShowNotAvailabe, fmt.Sprintf(msg, notpresent_msg, temp_cx, light_lothr)} + } +} +func EventToXMPP(bot *r3xmppbot.XmppBot, events <- chan interface{}, xmpp_presence_events_chan chan <- interface{}) { + button_msg := "Dooom ! The button has been pressed ! Propably someone is bored and in need of company ! ;-)" defer func() { if x := recover(); x != nil { + //defer ist called _after_ EventToXMPP function has returned. Thus we recover after returning from this function. Syslog_.Printf("handleIncomingXMPPStanzas: run time panic: %v", x) - ps.Unsub(events, "presence","door","buttons","updateinterval") - close(xmpp_presence_events_chan_) } }() - var present, frontlock, frontshut bool = false, true, true - var last_buttonpress int64 = 0 - var last_door_cmd r3events.DoorCommandEvent; - button_msg := "Dooom ! The button has been pressed ! Propably someone is bored and in need of company ! ;-)" - present_status := r3xmppbot.XMPPStatusEvent{r3xmppbot.ShowOnline,"Somebody is present"} - notpresent_status := r3xmppbot.XMPPStatusEvent{r3xmppbot.ShowNotAvailabe,"Nobody is here"} - button_status := r3xmppbot.XMPPStatusEvent{r3xmppbot.ShowFreeForChat, "The button has been pressed :-)"} + var present, frontlock bool = false, true + var last_buttonpress, light_lothr int64 = 0, 0 + var temp_cx float64 = 0.0 + var last_door_cmd r3events.DoorCommandEvent + var last_frontdoor_ajar r3events.DoorAjarUpdate = r3events.DoorAjarUpdate{true, 0} + var standard_distribute_level r3xmppbot.R3JIDDesire = r3xmppbot.R3DebugInfo // initial state, changed after startup finished event recieved - xmpp_presence_events_chan_ <- r3xmppbot.XMPPStatusEvent{r3xmppbot.ShowNotAvailabe, "Nobody is here"} + xmpp_presence_events_chan <- r3xmppbot.XMPPStatusEvent{r3xmppbot.ShowNotAvailabe, "Nobody is here"} for eventinterface := range(events) { Debug_.Printf("event2xmpp: %T %+v", eventinterface, eventinterface) switch event := eventinterface.(type) { + case EventToXMPPStartupFinished: + //after we received all events from QueryLatestEventsAndInjectThem, we get this event and start sending new events normally + standard_distribute_level = r3xmppbot.R3OnlineOnlyInfo case r3events.PresenceUpdate: present = event.Present - if present { - xmpp_presence_events_chan_ <- present_status - } else { - xmpp_presence_events_chan_ <- notpresent_status - } + if ! present { last_buttonpress = 0 } + xmpp_presence_events_chan <- composePresence(present, temp_cx, light_lothr, last_buttonpress) case r3events.DoorCommandEvent: last_door_cmd = event - xmpp_presence_events_chan_ <- fmt.Sprintln("DoorCommand:",event.Command, "using", event.Using, "by", event.Who, time.Unix(event.Ts,0)) + xmpp_presence_events_chan <- fmt.Sprintln("DoorCommand:",event.Command, "using", event.Using, "by", event.Who, time.Unix(event.Ts,0)) case r3events.DoorLockUpdate: if frontlock != event.Locked { - xmpp_presence_events_chan_ <- r3xmppbot.XMPPMsgEvent{Msg: composeDoorLockMessage(event.Locked, frontshut, last_door_cmd, event.Ts), DistributeLevel: r3xmppbot.R3OnlineOnlyInfo, RememberAsStatus: true} + xmpp_presence_events_chan <- r3xmppbot.XMPPMsgEvent{Msg: composeDoorLockMessage(event.Locked, last_frontdoor_ajar, last_door_cmd, event.Ts), DistributeLevel:standard_distribute_level, RememberAsStatus: true} } frontlock = event.Locked case r3events.DoorAjarUpdate: - if frontshut != event.Shut { - xmpp_presence_events_chan_ <- r3xmppbot.XMPPMsgEvent{Msg: fmt.Sprintf("Frontdoor is %s (%s)",IfThenElseStr(event.Shut,"now shut.","ajar."),time.Unix(event.Ts,0).String()), DistributeLevel: r3xmppbot.R3DebugInfo, RememberAsStatus: false} + if last_frontdoor_ajar.Shut != event.Shut { + xmpp_presence_events_chan <- r3xmppbot.XMPPMsgEvent{Msg: fmt.Sprintf("Frontdoor is %s (%s)",IfThenElseStr(event.Shut,"now shut.","ajar."),time.Unix(event.Ts,0).String()), DistributeLevel: r3xmppbot.R3DebugInfo, RememberAsStatus: false} } - frontshut = event.Shut + last_frontdoor_ajar = event case r3events.BackdoorAjarUpdate: - xmpp_presence_events_chan_ <- r3xmppbot.XMPPMsgEvent{Msg: fmt.Sprintf("Backdoor is %s (%s)",IfThenElseStr(event.Shut,"now shut.","ajar!"),time.Unix(event.Ts,0).String()), DistributeLevel: r3xmppbot.R3OnlineOnlyInfo, RememberAsStatus: false} + xmpp_presence_events_chan <- r3xmppbot.XMPPMsgEvent{Msg: fmt.Sprintf("Backdoor is %s (%s)",IfThenElseStr(event.Shut,"now shut.","ajar!"),time.Unix(event.Ts,0).String()), DistributeLevel: standard_distribute_level, RememberAsStatus: false} + case r3events.GasLeakAlert: + xmpp_presence_events_chan <- r3xmppbot.XMPPMsgEvent{Msg: fmt.Sprintf("ALERT !! GasLeak Detected !!! (%s)", time.Unix(event.Ts,0).String()), DistributeLevel: r3xmppbot.R3NeverInfo, RememberAsStatus: false} + case r3events.IlluminationSensorUpdate: + light_lothr = event.Value + case r3events.TempSensorUpdate: + if event.Sensorindex == 1 { + temp_cx = event.Value + } case r3events.BoreDoomButtonPressEvent: - xmpp_presence_events_chan_ <- r3xmppbot.XMPPMsgEvent{Msg: button_msg, DistributeLevel: r3xmppbot.R3OnlineOnlyInfo} - xmpp_presence_events_chan_ <- button_status last_buttonpress = event.Ts + xmpp_presence_events_chan <- composePresence(present, temp_cx, light_lothr, last_buttonpress) + xmpp_presence_events_chan <- r3xmppbot.XMPPMsgEvent{Msg: button_msg, DistributeLevel: standard_distribute_level} case r3events.TimeTick: - if present && last_buttonpress > 0 && time.Now().Unix() - last_buttonpress > button_press_timeout_ { - xmpp_presence_events_chan_ <- present_status - last_buttonpress = 0 - } + // update presence text with sensor and button info + xmpp_presence_events_chan <- composePresence(present, temp_cx, light_lothr, last_buttonpress) + // Try to XMPP Ping the server and if that fails, quit XMPPBot + if bot.PingServer(900) == false && bot.PingServer(900) == false && bot.PingServer(900) == false && bot.PingServer(900) == false && bot.PingServer(900) == false { return } + case r3events.DoorProblemEvent: + xmpp_presence_events_chan <- r3xmppbot.XMPPMsgEvent{Msg: fmt.Sprintf("Door Problem: %s. SeverityLevel: %d (%s)",event.Problem, event.Severity, time.Unix(event.Ts,0).String()), DistributeLevel: r3xmppbot.R3OnlineOnlyInfo, RememberAsStatus: false} } } } +func RunXMPPBot(ps *pubsub.PubSub, zmqctx *zmq.Context) { + var xmpperr error + var bot *r3xmppbot.XmppBot + var xmpp_presence_events_chan chan interface{} + for { + bot, xmpp_presence_events_chan, xmpperr = r3xmppbot.NewStartedBot(xmpp_login_.jid, xmpp_login_.pass, xmpp_bot_authstring_, xmpp_state_save_dir_, true) + if xmpperr == nil { + Syslog_.Printf("Successfully (re)started XMPP Bot") + // subscribe before QueryLatestEventsAndInjectThem and EventToXMPP + psevents := ps.Sub("presence","door","buttons","updateinterval","sensors","xmppmeta") + QueryLatestEventsAndInjectThem(ps, zmqctx) + ps.Pub(EventToXMPPStartupFinished{}, "xmppmeta") + EventToXMPP(bot, psevents, xmpp_presence_events_chan) + // unsubscribe right away, since we don't known when reconnect will succeed and we don't want to block PubSub + ps.Unsub(psevents, "presence","door","buttons","updateinterval","sensors","xmppmeta") + bot.StopBot() + } else { + Syslog_.Printf("Error starting XMPP Bot: %s", xmpperr.Error()) + } + time.Sleep(10 * time.Second) + } +} + func ParseZMQr3Event(lines [][]byte, ps *pubsub.PubSub) { evnt, pubsubcat, err := r3events.UnmarshalByteByte2Event(lines) Debug_.Printf("ParseZMQr3Event: %s %s %s", evnt, pubsubcat, err) @@ -132,6 +181,20 @@ func ParseZMQr3Event(lines [][]byte, ps *pubsub.PubSub) { ps.Pub(evnt, pubsubcat) } +func QueryLatestEventsAndInjectThem(ps *pubsub.PubSub, zmqctx *zmq.Context) { + answ := ZmqsAskQuestionsAndClose(zmqctx, brain_connect_addr_, [][][]byte{ + [][]byte{[]byte("BackdoorAjarUpdate")}, + [][]byte{[]byte("DoorCommandEvent")}, + [][]byte{[]byte("DoorLockUpdate")}, + [][]byte{[]byte("DoorAjarUpdate")}, + [][]byte{[]byte("PresenceUpdate")}, + [][]byte{[]byte("IlluminationSensorUpdate")}, + [][]byte{[]byte("TempSensorUpdate")}}) + for _, a := range(answ) { + ParseZMQr3Event(a, ps) + } +} + func main() { if enable_syslog_ { LogEnableSyslog(); r3xmppbot.LogEnableSyslog() } if enable_debug_ { LogEnableDebuglog(); r3xmppbot.LogEnableDebuglog() } @@ -144,33 +207,18 @@ func main() { panic("zmq sockets must not be nil !!") } - var xmpperr error - var bot *r3xmppbot.XmppBot - bot, xmpp_presence_events_chan_, xmpperr = r3xmppbot.NewStartedBot(xmpp_login_.jid, xmpp_login_.pass, xmpp_bot_authstring_, xmpp_state_save_dir_, true) - - ps := pubsub.New(1) + ps := pubsub.New(10) defer ps.Shutdown() //~ brn := brain.New() //~ defer brn.Shutdown() go EventToWeb(ps) - if xmpperr == nil { - defer bot.StopBot() - go EventToXMPP(ps, xmpp_presence_events_chan_) - } else { - fmt.Println(xmpperr) - fmt.Println("XMPP Bot disabled") - Syslog_.Printf("XMPP Bot disabled due to error: %s", xmpperr.Error()) - } - // --- get update on most recent events --- - answ := ZmqsAskQuestionsAndClose(zmqctx, brain_connect_addr_, [][][]byte{[][]byte{[]byte("DoorCommandEvent")}, [][]byte{[]byte("DoorLockUpdate")}, [][]byte{[]byte("DoorAjarUpdate")}, [][]byte{[]byte("PresenceUpdate")}, [][]byte{[]byte("IlluminationSensorUpdate")}, [][]byte{[]byte("TempSensorUpdate")}}) - for _, a := range(answ) { - ParseZMQr3Event(a, ps) - } + QueryLatestEventsAndInjectThem(ps, zmqctx) + go RunXMPPBot(ps, zmqctx) // --- receive and distribute events --- - ticker := time.NewTicker(time.Duration(7) * time.Minute) + ticker := time.NewTicker(time.Duration(6) * time.Minute) for { select { case e := <-zmqsub.In():