X-Git-Url: http://average.org/gitweb/?a=blobdiff_plain;f=loctrkd%2Fwatch.py;h=5338d03495564d25bd5d100769c7294dfae944d3;hb=a4a6606a30e8ba743c269083f1922222b0e1e81a;hp=a8a53b0dd62f04938bef519e200796986a45a3a4;hpb=dbdf9d63af31770ad57302e16b17a2fdc526773f;p=loctrkd.git

diff --git a/loctrkd/watch.py b/loctrkd/watch.py
index a8a53b0..5338d03 100644
--- a/loctrkd/watch.py
+++ b/loctrkd/watch.py
@@ -2,12 +2,14 @@
 
 from configparser import ConfigParser
 from datetime import datetime, timezone
+from importlib import import_module
 from logging import getLogger
+from typing import Any, cast, List
 import zmq
 
 from . import common
-from .zx303proto import parse_message
-from .zmsg import Bcast
+from .protomodule import ProtoModule
+from .zmsg import Bcast, Rept
 
 log = getLogger("loctrkd/watch")
 
@@ -15,15 +17,48 @@ log = getLogger("loctrkd/watch")
 def runserver(conf: ConfigParser) -> None:
     # Is this https://github.com/zeromq/pyzmq/issues/1627 still not fixed?!
     zctx = zmq.Context()  # type: ignore
-    zsub = zctx.socket(zmq.SUB)  # type: ignore
-    zsub.connect(conf.get("collector", "publishurl"))
-    zsub.setsockopt(zmq.SUBSCRIBE, b"")
+    zraw = zctx.socket(zmq.SUB)  # type: ignore
+    zraw.connect(conf.get("collector", "publishurl"))
+    zraw.setsockopt(zmq.SUBSCRIBE, b"")
+    zrep = zctx.socket(zmq.SUB)  # type: ignore
+    zrep.connect(conf.get("rectifier", "publishurl"))
+    zrep.setsockopt(zmq.SUBSCRIBE, b"")
+    poller = zmq.Poller()  # type: ignore
+    poller.register(zraw, flags=zmq.POLLIN)
+    poller.register(zrep, flags=zmq.POLLIN)
 
     try:
         while True:
-            zmsg = Bcast(zsub.recv())
-            msg = parse_message(zmsg.packet, zmsg.is_incoming)
-            print("I" if zmsg.is_incoming else "O", zmsg.imei, msg)
+            events = poller.poll(1000)
+            for sk, fl in events:
+                if sk is zraw:
+                    while True:
+                        try:
+                            zmsg = Bcast(zraw.recv(zmq.NOBLOCK))
+                        except zmq.Again:
+                            break
+                        print(
+                            "I" if zmsg.is_incoming else "O",
+                            zmsg.proto,
+                            zmsg.imei,
+                        )
+                        pmod = common.pmod_for_proto(zmsg.proto)
+                        if pmod is not None:
+                            msg = pmod.parse_message(
+                                zmsg.packet, zmsg.is_incoming
+                            )
+                            print(msg)
+                            if zmsg.is_incoming and hasattr(msg, "rectified"):
+                                print("Rectified:", msg.rectified())
+                elif sk is zrep:
+                    while True:
+                        try:
+                            rept = Rept(zrep.recv(zmq.NOBLOCK))
+                        except zmq.Again:
+                            break
+                        print(rept)
+                else:
+                    print("what is this socket?!", sk)
     except KeyboardInterrupt:
         pass