firmware messages are a pain to parse

[svn42.git] / go / r3-eventbroker_zmq / sockettoevent.go

diff --git a/go/r3-eventbroker_zmq/sockettoevent.go b/go/r3-eventbroker_zmq/sockettoevent.go
index ea9b0e5..2445c78 100644 (file)
--- a/go/r3-eventbroker_zmq/sockettoevent.go
+++ b/go/r3-eventbroker_zmq/sockettoevent.go
@@ -10,12 +10,13 @@ import (
     pubsub "github.com/tuxychandru/pubsub"
     zmq "github.com/vaughan0/go-zmq"
     "log"
+    "./r3events"
     )
 
 var (
        re_presence_    *regexp.Regexp     = regexp.MustCompile("Presence: (yes|no)(?:, (opened|closed), (.+))?")
        re_state_      *regexp.Regexp     = regexp.MustCompile("State: (closed|opened|manual movement|error|reset|timeout after open|timeout after close|opening|closing).*")
-       re_status_      *regexp.Regexp     = regexp.MustCompile("Status: (closed|opened) (closed|opened|manual movement|error|reset|timeout after open|timeout after close|opening|closing) (ajar|shut).*")
+       re_status_      *regexp.Regexp     = regexp.MustCompile("Status: (closed|opened), (closed|opened|manual movement|error|reset|timeout after open|timeout after close|opening|closing), (ajar|shut).*")
        re_infocard_      *regexp.Regexp     = regexp.MustCompile("Info\\(card\\): card\\(([a-fA-F0-9]+)\\) (found|not found).*")
        re_cardid_      *regexp.Regexp     = regexp.MustCompile("card\\(([a-fA-F0-9]+)\\)")
        re_infoajar_      *regexp.Regexp     = regexp.MustCompile("Info\\(ajar\\): door is now (ajar|shut)")
@@ -26,71 +27,26 @@ var (
 )
 
 
-type DoorLockUpdate struct {
-    DoorID int
-    Locked bool
-    Ts int64
-}
-
-type DoorAjarUpdate struct {
-    DoorID int
-    Shut bool
-    Ts int64
-}
-
-type DoorCommandEvent struct {
-    Command string
-    Using string
-    Who string
-    Ts int64
-}
-
-type ButtonPressUpdate struct {
-    Buttonindex int
-    Ts int64
-}
-
-type TempSensorUpdate struct {
-    Sensorindex int
-    Value float64
-    Ts int64
-}
-
-type IlluminationSensorUpdate struct {
-    Sensorindex int
-    Value int64
-    Ts int64
-}
-
-type TimeTick struct {
-    Ts int64
-}
-
-type MovementSensorUpdate struct {
-    Sensorindex int
-    Ts int64
-}
-
 func parseSocketInputLine_State(lines [][]byte, ps *pubsub.PubSub, ts int64) {
     switch string(lines[0]) {
-        case "closed":
-            ps.Pub(DoorLockUpdate{0, true, ts}, "door")
-        case "opened":
-            ps.Pub(DoorLockUpdate{0, false, ts}, "door")
+        case "closed,":
+            ps.Pub(r3events.DoorLockUpdate{0, true, ts}, "door")
+        case "opened,":
+            ps.Pub(r3events.DoorLockUpdate{0, false, ts}, "door")
         case "manual":   //movement
-        case "error":
-        case "reset":
-            ps.Pub(DoorLockUpdate{0, true, ts}, "door")
+        case "error,":
+        case "reset,":
+            ps.Pub(r3events.DoorLockUpdate{0, true, ts}, "door")
         case "timeout":   //after open | after close
-        case "opening":
-        case "closing":
+        case "opening,":
+        case "closing,":
         default:
+            log.Print("parseSocketInputLine_State: Unexpected State:", lines)
     }
 }
 
 
 func ParseSocketInputLine(lines [][]byte, ps *pubsub.PubSub, keylookup_socket *zmq.Socket) { //, brn *brain.Brain) {
-    var tidbit interface{}
     ts := time.Now().Unix()
     if len(lines) < 1 { return }
     log.Printf("ParseSocketInputLine: %s %s",string(lines[0]), lines[1:])
@@ -100,12 +56,8 @@ func ParseSocketInputLine(lines [][]byte, ps *pubsub.PubSub, keylookup_socket *z
             parseSocketInputLine_State(lines[1:], ps, ts)
         case "Status:":
             if len(lines) < 3 { return }
-            tidbit = DoorLockUpdate{0, string(lines[1]) == "closed", ts}
-            //~ brn.Oboite("door", tidbit)
-            ps.Pub(tidbit, "door")
-            tidbit = DoorAjarUpdate{0, string(lines[len(lines)-2]) == "shut", ts}
-            //~ brn.Oboite("door", tidbit)
-            ps.Pub(tidbit, "door")
+            ps.Pub(r3events.DoorLockUpdate{0, string(lines[1]) == "closed,", ts}, "door")
+            ps.Pub(r3events.DoorAjarUpdate{0, string(lines[len(lines)-1]) == "shut", ts}, "door")
         case "Info(card):":
             if len(lines) < 3 { return }
             if string(lines[2]) != "found" { return }
@@ -118,26 +70,36 @@ func ParseSocketInputLine(lines [][]byte, ps *pubsub.PubSub, keylookup_socket *z
                     nick = "Unresolvable KeyID"
                 }
                 // new event: toggle by user nick using card
-                ps.Pub(DoorCommandEvent{"toggle", "Card", nick, ts},"doorcmd")
+                ps.Pub(r3events.DoorCommandEvent{"toggle", "Card", nick, ts},"doorcmd")
             }
         case "Info(ajar):":
             if len(lines) < 5 { return }
-            tidbit = DoorAjarUpdate{0, string(lines[4]) == "shut", ts}
-            //~ brn.Oboite("door", tidbit)
-            ps.Pub(tidbit, "door")
+            ps.Pub(r3events.DoorAjarUpdate{0, string(lines[4]) == "shut", ts}, "door")
         case "open", "close", "toggle", "reset":
-            ps.Pub(DoorCommandEvent{string(lines[0]), string(lines[1]), string(lines[2]), ts},"doorcmd")
+            ps.Pub(r3events.DoorCommandEvent{string(lines[0]), string(lines[1]), string(lines[2]), ts},"doorcmd")
         case "photo0":
             newphoto, err := strconv.ParseInt(string(lines[1]), 10, 32)
             if err == nil {
                 // brn.Oboite("photo0", newphoto)
-                ps.Pub(IlluminationSensorUpdate{0, newphoto, ts}, "sensors")
+                ps.Pub(r3events.IlluminationSensorUpdate{0, newphoto, ts}, "sensors")
             }
+        case "IlluminationSensorUpdate","TempSensorUpdate":
+            //try decode r3event
+            evnt, err := r3events.UnmarshalByteByte2Event(lines)
+            if err == nil {ps.Pub(evnt, "sensors")}
+        case "MovementSensorUpdate" :
+            //try decode r3event
+            evnt, err := r3events.UnmarshalByteByte2Event(lines)
+            if err == nil {ps.Pub(evnt, "movement")}
+        case "ButtonPressUpdate" :
+            //try decode r3event
+            evnt, err := r3events.UnmarshalByteByte2Event(lines)
+            if err == nil {ps.Pub(evnt, "buttons")}
     }
 }
 
 func MakeTimeTick(ps *pubsub.PubSub) {
-    ps.Pub(TimeTick{time.Now().Unix()},"time")
+    ps.Pub(r3events.TimeTick{time.Now().Unix()},"time")
 }
 
     //~ match_presence := re_presence_.FindStringSubmatch(line)