X-Git-Url: http://average.org/gitweb/?a=blobdiff_plain;f=gps303%2Fzmsg.py;h=b6faa7025a1df310422e6e51603878d9c01254b1;hb=bf48ccad4b4b91e7d7e09d1087f5953bc2db97d7;hp=56392007f1ff74ecd61cf59b8a95b1b9c2c06c48;hpb=faa0b11a46a7ff8797640433afdb1bfd11bce611;p=loctrkd.git

diff --git a/gps303/zmsg.py b/gps303/zmsg.py
index 5639200..b6faa70 100644
--- a/gps303/zmsg.py
+++ b/gps303/zmsg.py
@@ -2,32 +2,47 @@
 
 import ipaddress as ip
 from struct import pack, unpack
+from typing import Any, cast, Optional, Tuple, Type, Union
 
-__all__ = "Bcast", "Resp"
+__all__ = "Bcast", "Resp", "topic"
 
 
-def pack_peer(peeraddr):
-    try:
+def pack_peer(  # 18 bytes
+    peeraddr: Union[None, Tuple[str, int], Tuple[str, int, Any, Any]]
+) -> bytes:
+    if peeraddr is None:
+        addr: Union[ip.IPv4Address, ip.IPv6Address] = ip.IPv6Address(0)
+        port = 0
+    elif len(peeraddr) == 2:
+        peeraddr = cast(Tuple[str, int], peeraddr)
+        saddr, port = peeraddr
+        addr = ip.ip_address(saddr)
+    elif len(peeraddr) == 4:
+        peeraddr = cast(Tuple[str, int, Any, Any], peeraddr)
         saddr, port, _x, _y = peeraddr
         addr = ip.ip_address(saddr)
-    except ValueError:
-        saddr, port = peeraddr
-        a4 = ip.ip_address(saddr)
-        addr = ip.IPv6Address(b"\0\0\0\0\0\0\0\0\0\0\xff\xff" + a4.packed)
+    if isinstance(addr, ip.IPv4Address):
+        addr = ip.IPv6Address(b"\0\0\0\0\0\0\0\0\0\0\xff\xff" + addr.packed)
     return addr.packed + pack("!H", port)
 
 
-def unpack_peer(buffer):
+def unpack_peer(
+    buffer: bytes,
+) -> Tuple[str, int]:
     a6 = ip.IPv6Address(buffer[:16])
     port = unpack("!H", buffer[16:])[0]
-    addr = a6.ipv4_mapped
-    if addr is None:
-        addr = a6
-    return (addr, port)
+    a4 = a6.ipv4_mapped
+    if a4 is not None:
+        return (str(a4), port)
+    elif a6 == ip.IPv6Address("::"):
+        return ("", 0)
+    return (str(a6), port)
 
 
 class _Zmsg:
-    def __init__(self, *args, **kwargs):
+    KWARGS: Tuple[Tuple[str, Any], ...]
+
+    def __init__(self, *args: Any, **kwargs: Any) -> None:
         if len(args) == 1:
             self.decode(args[0])
         elif bool(kwargs):
@@ -42,7 +57,7 @@ class _Zmsg:
                 + str(kwargs)
             )
 
-    def __repr__(self):
+    def __repr__(self) -> str:
         return "{}({})".format(
             self.__class__.__name__,
             ", ".join(
@@ -58,23 +73,39 @@ class _Zmsg:
             ),
         )
 
-    def decode(self, buffer):
-        raise RuntimeError(
-            self.__class__.__name__ + "must implement `encode()` method"
+    def __eq__(self, other: object) -> bool:
+        if isinstance(other, self.__class__):
+            return all(
+                [getattr(self, k) == getattr(other, k) for k, _ in self.KWARGS]
+            )
+        return NotImplemented
+
+    def decode(self, buffer: bytes) -> None:
+        raise NotImplementedError(
+            self.__class__.__name__ + "must implement `decode()` method"
         )
 
     @property
-    def packed(self):
-        raise RuntimeError(
-            self.__class__.__name__ + "must implement `encode()` method"
+    def packed(self) -> bytes:
+        raise NotImplementedError(
+            self.__class__.__name__ + "must implement `packed()` property"
         )
 
 
+def topic(
+    proto: str, is_incoming: bool = True, imei: Optional[str] = None
+) -> bytes:
+    return pack("B16s", is_incoming, proto.encode()) + (
+        b"" if imei is None else pack("16s", imei.encode())
+    )
+
+
 class Bcast(_Zmsg):
     """Zmq message to broadcast what was received from the terminal"""
 
     KWARGS = (
-        ("proto", 256),
+        ("is_incoming", True),
+        ("proto", "UNKNOWN"),
         ("imei", None),
         ("when", None),
         ("peeraddr", None),
@@ -82,40 +113,56 @@ class Bcast(_Zmsg):
     )
 
     @property
-    def packed(self):
+    def packed(self) -> bytes:
         return (
-            pack("B", self.proto)
-            + ("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)
+            pack(
+                "!B16s16sd",
+                int(self.is_incoming),
+                self.proto[:16].ljust(16, "\0").encode(),
+                b"0000000000000000"
+                if self.imei is None
+                else self.imei.encode(),
+                0 if self.when is None else self.when,
             )
             + pack_peer(self.peeraddr)
             + self.packet
         )
 
-    def decode(self, buffer):
-        self.proto = buffer[0]
-        self.imei = buffer[1:17].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:]
+    def decode(self, buffer: bytes) -> None:
+        is_incoming, proto, imei, when = unpack("!B16s16sd", buffer[:41])
+        self.is_incoming = bool(is_incoming)
+        self.proto = proto.decode()
+        self.imei = (
+            None if imei == b"0000000000000000" else imei.decode().strip("\0")
+        )
+        self.when = when
+        self.peeraddr = unpack_peer(buffer[41:59])
+        self.packet = buffer[59:]
 
 
 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):
+    def packed(self) -> bytes:
         return (
-            "0000000000000000" if self.imei is None else self.imei.encode()
-        ) + self.packet
+            pack(
+                "!16sd",
+                "0000000000000000"
+                if self.imei is None
+                else self.imei.encode(),
+                0 if self.when is None else self.when,
+            )
+            + self.packet
+        )
+
+    def decode(self, buffer: bytes) -> None:
+        imei, when = unpack("!16sd", buffer[:24])
+        self.imei = (
+            None if imei == b"0000000000000000" else imei.decode().strip("\0")
+        )
 
-    def decode(self, buffer):
-        self.imei = buffer[:16].decode()
-        self.packet = buffer[16:]
+        self.when = when
+        self.packet = buffer[24:]