X-Git-Url: http://average.org/gitweb/?a=blobdiff_plain;f=loctrkd%2Fzmsg.py;h=6539d5f18f67b8e3e88faa760ccbadb104af2861;hb=2cf0fd9d215dda17eae4261ab7967367f6aa0028;hp=ae469a23b6afe416ac9a1cc6f8e9abe25b2ab022;hpb=63a086cf3956b93f760b1a0344afd757e0d0392f;p=loctrkd.git

diff --git a/loctrkd/zmsg.py b/loctrkd/zmsg.py
index ae469a2..6539d5f 100644
--- a/loctrkd/zmsg.py
+++ b/loctrkd/zmsg.py
@@ -4,7 +4,7 @@ import ipaddress as ip
 from struct import pack, unpack
 from typing import Any, cast, Optional, Tuple, Type, Union
 
-__all__ = "Bcast", "Resp", "topic"
+__all__ = "Bcast", "Resp", "topic", "rtopic"
 
 
 def pack_peer(  # 18 bytes
@@ -100,6 +100,10 @@ def topic(
     )
 
 
+def rtopic(imei: str) -> bytes:
+    return pack("16s", imei.encode())
+
+
 class Bcast(_Zmsg):
     """Zmq message to broadcast what was received from the terminal"""
 
@@ -166,3 +170,35 @@ class Resp(_Zmsg):
 
         self.when = when
         self.packet = buffer[24:]
+
+
+class Rept(_Zmsg):
+    """Broadcast zmq message with "rectified" proto-agnostic json data"""
+
+    KWARGS = (("imei", None), ("payload", ""), ("pmod", None))
+
+    @property
+    def packed(self) -> bytes:
+        return (
+            pack(
+                "16s16s",
+                b"0000000000000000"
+                if self.imei is None
+                else self.imei.encode(),
+                b"                "
+                if self.pmod is None
+                else self.pmod.encode(),
+            )
+            + self.payload.encode()
+        )
+
+    def decode(self, buffer: bytes) -> None:
+        imei = buffer[:16]
+        self.imei = (
+            None if imei == b"0000000000000000" else imei.decode().strip("\0")
+        )
+        pmod = buffer[16:32]
+        self.pmod = (
+            None if pmod == b"                " else pmod.decode().strip("\0")
+        )
+        self.payload = buffer[32:].decode()