X-Git-Url: http://www.average.org/gitweb/?a=blobdiff_plain;f=gps303%2Fzmsg.py;h=0457685ab05ab6bf6cade6eb466c9ccce3a48946;hb=2cc29ee67b6432e1cd74a21b3c9181b8b5b557f9;hp=0ccef007db6a0ddc5a9491b6d661ec89a63c1a57;hpb=38f814dde6ea7ff8b33d8f5de49fa8fb007b7e2a;p=loctrkd.git

diff --git a/gps303/zmsg.py b/gps303/zmsg.py
index 0ccef00..0457685 100644
--- a/gps303/zmsg.py
+++ b/gps303/zmsg.py
@@ -1,16 +1,18 @@
 """ Zeromq messages """
 
-from datetime import datetime, timezone
-from json import dumps, loads
 import ipaddress as ip
 from struct import pack, unpack
 
-__all__ = "Bcast", "LocEvt", "Resp"
+__all__ = "Bcast", "Resp", "topic"
 
 
 def pack_peer(peeraddr):
     try:
-        saddr, port, _x, _y = peeraddr
+        if peeraddr is None:
+            saddr = "::"
+            port = 0
+        else:
+            saddr, port, _x, _y = peeraddr
         addr = ip.ip_address(saddr)
     except ValueError:
         saddr, port = peeraddr
@@ -77,10 +79,17 @@ class _Zmsg:
         )
 
 
+def topic(proto, is_incoming=True, imei=None):
+    return (
+        pack("BB", is_incoming, proto) + b"" if imei is None else imei.encode()
+    )
+
+
 class Bcast(_Zmsg):
     """Zmq message to broadcast what was received from the terminal"""
 
     KWARGS = (
+        ("is_incoming", True),
         ("proto", 256),
         ("imei", None),
         ("when", None),
@@ -91,7 +100,7 @@ class Bcast(_Zmsg):
     @property
     def packed(self):
         return (
-            pack("B", self.proto)
+            pack("BB", int(self.is_incoming), self.proto)
             + ("0000000000000000" if self.imei is None else self.imei).encode()
             + (
                 b"\0\0\0\0\0\0\0\0"
@@ -103,76 +112,34 @@ class Bcast(_Zmsg):
         )
 
     def decode(self, buffer):
-        self.proto = buffer[0]
-        self.imei = buffer[1:17].decode()
+        self.is_incoming = bool(buffer[0])
+        self.proto = buffer[1]
+        self.imei = buffer[2:18].decode()
         if self.imei == "0000000000000000":
             self.imei = None
-        self.when = unpack("!d", buffer[17:25])[0]
-        self.peeraddr = unpack_peer(buffer[25:43])
-        self.packet = buffer[43:]
+        self.when = unpack("!d", buffer[18:26])[0]
+        self.peeraddr = unpack_peer(buffer[26:44])
+        self.packet = buffer[44:]
 
 
 class Resp(_Zmsg):
     """Zmq message received from a third party to send to the terminal"""
 
-    KWARGS = (("imei", None), ("packet", b""))
+    KWARGS = (("imei", None), ("when", None), ("packet", b""))
 
     @property
     def packed(self):
         return (
-            "0000000000000000" if self.imei is None else self.imei.encode()
-        ) + self.packet
-
-    def decode(self, buffer):
-        self.imei = buffer[:16].decode()
-        self.packet = buffer[16:]
-
-
-class LocEvt(_Zmsg):
-    """Zmq message with original or approximated location from lookaside"""
-
-    KWARGS = (
-        ("imei", "0000000000000000"),
-        ("devtime", datetime(1970, 1, 1, tzinfo=timezone.utc)),
-        ("lat", 0.0),
-        ("lon", 0.0),
-        ("is_gps", True),
-    )
-
-    # This message is for external consumption, so use json encoding,
-    # except imei that forms 16 byte prefix that can be used as the
-    # topic to subscribe.
-    @property
-    def packed(self):
-        return (
-            self.imei.encode()
-            + dumps(
-                {
-                    "devtime": str(self.devtime),
-                    "latitude": self.lat,
-                    "longitude": self.lon,
-                    "is-gps": self.is_gps,
-                }
-            ).encode()
-        )
-
-    # And this is full json that can be sent over websocket etc.
-    @property
-    def json(self):
-        return dumps(
-            {
-                "imei": self.imei,
-                "devtime": str(self.devtime),
-                "latitude": self.lat,
-                "longitude": self.lon,
-                "is-gps": self.is_gps,
-            }
+            ("0000000000000000" if self.imei is None else self.imei.encode())
+            + (
+                b"\0\0\0\0\0\0\0\0"
+                if self.when is None
+                else pack("!d", self.when)
+            )
+            + self.packet
         )
 
     def decode(self, buffer):
         self.imei = buffer[:16].decode()
-        json_data = loads(buffer[16:])
-        self.devtime = datetime.fromisoformat(json_data["devtime"])
-        self.lat = json_data["latitude"]
-        self.lon = json_data["longitude"]
-        self.is_gps = json_data["is-gps"]
+        self.when = unpack("!d", buffer[16:24])[0]
+        self.packet = buffer[24:]