X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;f=go%2Fr3-netstatus%2Fmain.go;h=cc63daa1b4f66f9933b7ce8e9983b853b87673f7;hb=cb2342c75d929f11f901e6f8e3d44f6bdc0261b4;hp=b65e96e8c01f9b04c379134afbf654e384a7949d;hpb=b7182b7f1d5dae86d81310beaa6ce6d693696572;p=svn42.git diff --git a/go/r3-netstatus/main.go b/go/r3-netstatus/main.go index b65e96e..cc63daa 100644 --- a/go/r3-netstatus/main.go +++ b/go/r3-netstatus/main.go @@ -9,7 +9,8 @@ import ( "time" "fmt" //~ "./brain" - r3events "svn.spreadspace.org/realraum/go.svn/r3-eventbroker_zmq/r3events" + 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 @@ -40,10 +40,8 @@ func init() { 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.BoolVar(&enable_syslog_, "syslog", false, "enable logging to syslog") - flag.BoolVar(&enable_debug_, "debug", false, "enable debug logging") + flag.BoolVar(&enable_debug_, "debug", false, "enable debug output") flag.Parse() - if enable_syslog_ { LogEnableSyslog(); r3xmppbot.LogEnableSyslog() } - if enable_debug_ { LogEnableDebuglog(); r3xmppbot.LogEnableDebuglog() } } //------- @@ -52,74 +50,124 @@ func IfThenElseStr(c bool, strue, sfalse string) string { if c {return strue} else {return sfalse} } -func composeMessage(present, locked, shut bool, who string, ts int64) string { - return fmt.Sprintf("%s (Door is %s and %s and was last used%s at %s)", - IfThenElseStr(present, "Somebody is present!" , "Everybody left."), - IfThenElseStr(locked, "locked","unlocked"), - IfThenElseStr(shut, "shut","ajar"), - IfThenElseStr(len(who) == 0,"", " by " + who), - time.Unix(ts,0).String()) +func composeDoorLockMessage(locked bool, frontshut r3events.DoorAjarUpdate, doorcmd r3events.DoorCommandEvent, ts int64) string { + var ajarstring string = ""; + if frontshut.Shut == false && frontshut.Ts < doorcmd.Ts { + ajarstring = " (still ajar)" + } + if ts - doorcmd.Ts < 30 { + if len(doorcmd.Who) == 0 || doorcmd.Who == "-" { + return fmt.Sprintf("The%s frontdoor was %s by %s at %s.",ajarstring, IfThenElseStr(locked, "locked","unlocked"), doorcmd.Using, time.Unix(ts,0).String()) + } else { + return fmt.Sprintf("%s %s the%s frontdoor by %s at %s.",doorcmd.Who, IfThenElseStr(locked, "locked","unlocked"), ajarstring, doorcmd.Using, time.Unix(ts,0).String()) + } + } else { + return fmt.Sprintf("The%s frontdoor was %s manually at %s.", ajarstring, IfThenElseStr(locked, "locked","unlocked"), time.Unix(ts,0).String()) + } } -func EventToXMPP(ps *pubsub.PubSub, xmpp_presence_events_chan_ chan <- interface{}) { - events := ps.Sub("presence","door","buttons","updateinterval") +func EventToXMPP(events <- chan interface{}, xmpp_presence_events_chan chan <- interface{}) { defer func() { if x := recover(); x != nil { - Debug_.Printf("handleIncomingXMPPStanzas: run time panic: %v", x) - ps.Unsub(events, "presence","door","buttons","updateinterval") - close(xmpp_presence_events_chan_) + //defer ist called _after_ EventToXMPP function has returned. Thus we recover after returning from this function. + Syslog_.Printf("handleIncomingXMPPStanzas: run time panic: %v", x) } }() - var present, locked, shut bool = false, true, true + var present, frontlock bool = false, true var last_buttonpress int64 = 0 - var who string + var last_door_cmd r3events.DoorCommandEvent; + var last_frontdoor_ajar r3events.DoorAjarUpdate = r3events.DoorAjarUpdate{true, 0}; 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 :-)"} - 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_.Println("event2xmpp", eventinterface) + Debug_.Printf("event2xmpp: %T %+v", eventinterface, eventinterface) switch event := eventinterface.(type) { case r3events.PresenceUpdate: present = event.Present - xmpp_presence_events_chan_ <- r3xmppbot.XMPPMsgEvent{Msg: composeMessage(present, locked, shut, who, event.Ts), DistributeLevel: r3xmppbot.R3OnlineOnlyInfo, RememberAsStatus: true} if present { - xmpp_presence_events_chan_ <- present_status + xmpp_presence_events_chan <- present_status } else { - xmpp_presence_events_chan_ <- notpresent_status + xmpp_presence_events_chan <- notpresent_status } case r3events.DoorCommandEvent: - if len(event.Who) > 0 && len(event.Using) > 0 { - who = fmt.Sprintf("%s (%s)",event.Who, event.Using) - } else { - who = event.Who - } - xmpp_presence_events_chan_ <- fmt.Sprintln("DoorCommand:",event.Command, "using", event.Using, "by", event.Who, time.Unix(event.Ts,0)) + last_door_cmd = event + xmpp_presence_events_chan <- fmt.Sprintln("DoorCommand:",event.Command, "using", event.Using, "by", event.Who, time.Unix(event.Ts,0)) case r3events.DoorLockUpdate: - locked = event.Locked - xmpp_presence_events_chan_ <- r3xmppbot.XMPPMsgEvent{Msg: composeMessage(present, locked, shut, who, event.Ts), DistributeLevel: r3xmppbot.R3DebugInfo, RememberAsStatus: true} + if frontlock != event.Locked { + xmpp_presence_events_chan <- r3xmppbot.XMPPMsgEvent{Msg: composeDoorLockMessage(event.Locked, last_frontdoor_ajar, last_door_cmd, event.Ts), DistributeLevel: r3xmppbot.R3OnlineOnlyInfo, RememberAsStatus: true} + } + frontlock = event.Locked case r3events.DoorAjarUpdate: - shut = event.Shut - xmpp_presence_events_chan_ <- r3xmppbot.XMPPMsgEvent{Msg: composeMessage(present, locked, shut, who, event.Ts), DistributeLevel: r3xmppbot.R3DebugInfo, RememberAsStatus: true} + 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} + } + 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} case r3events.BoreDoomButtonPressEvent: - xmpp_presence_events_chan_ <- r3xmppbot.XMPPMsgEvent{Msg: button_msg, DistributeLevel: r3xmppbot.R3OnlineOnlyInfo} - xmpp_presence_events_chan_ <- button_status + xmpp_presence_events_chan <- r3xmppbot.XMPPMsgEvent{Msg: button_msg, DistributeLevel: r3xmppbot.R3OnlineOnlyInfo} + xmpp_presence_events_chan <- button_status last_buttonpress = event.Ts case r3events.TimeTick: if present && last_buttonpress > 0 && time.Now().Unix() - last_buttonpress > button_press_timeout_ { - xmpp_presence_events_chan_ <- present_status + xmpp_presence_events_chan <- present_status last_buttonpress = 0 } } } } +func RunXMPPBot(ps *pubsub.PubSub, zmqctx *zmq.Context) { + var xmpperr error + var bot *r3xmppbot.XmppBot + var xmpp_presence_events_chan chan interface{} + psevents := ps.Sub("presence","door","buttons","updateinterval") + 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 { + QueryLatestEventsAndInjectThem(ps, zmqctx) + EventToXMPP(psevents, xmpp_presence_events_chan) + bot.StopBot() + } else { + Syslog_.Printf("Error starting XMPP Bot: %s", xmpperr.Error()) + } + time.Sleep(5 * time.Second) + } +} + +func ParseZMQr3Event(lines [][]byte, ps *pubsub.PubSub) { + evnt, pubsubcat, err := r3events.UnmarshalByteByte2Event(lines) + Debug_.Printf("ParseZMQr3Event: %s %s %s", evnt, pubsubcat, err) + if err != nil { return } + ps.Pub(evnt, pubsubcat) +} + +func QueryLatestEventsAndInjectThem(ps *pubsub.PubSub, zmqctx *zmq.Context) { + answ := ZmqsAskQuestionsAndClose(zmqctx, brain_connect_addr_, [][][]byte{ + [][]byte{[]byte("DoorCommandEvent")}, + [][]byte{[]byte("DoorLockUpdate")}, + [][]byte{[]byte("DoorAjarUpdate")}, + [][]byte{[]byte("BackdoorAjarUpdate")}, + [][]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() } + Syslog_.Print("started") + defer Syslog_.Print("exiting") zmqctx, zmqsub := ZmqsInit(r3eventssub_port_) defer zmqctx.Close() if zmqsub != nil {defer zmqsub.Close()} @@ -127,30 +175,15 @@ 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) - } - // --- get update on most recent events --- - answ := ZmqsAskQuestionsAndClose(zmqctx, brain_connect_addr_, [][][]byte{[][]byte{[]byte("DoorLockUpdate")}, [][]byte{[]byte("DoorAjarUpdate")}, [][]byte{[]byte("DoorCommandEvent")}, [][]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)