Fix test when servers crash; less logging

[loctrkd.git] / loctrkd / zmsg.py

diff --git a/loctrkd/zmsg.py b/loctrkd/zmsg.py
index b6faa7025a1df310422e6e51603878d9c01254b1..07798a63dc5dbcc5fb4512d6740f759af66d3c15 100644 (file)
--- 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
 
 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
 
 
 def pack_peer(  # 18 bytes


@@ -100,12 +100,17 @@ 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"""
 
     KWARGS = (
         ("is_incoming", True),
         ("proto", "UNKNOWN"),
 class Bcast(_Zmsg):
     """Zmq message to broadcast what was received from the terminal"""
 
     KWARGS = (
         ("is_incoming", True),
         ("proto", "UNKNOWN"),

+        ("pmod", None),

         ("imei", None),
         ("when", None),
         ("peeraddr", None),
         ("imei", None),
         ("when", None),
         ("peeraddr", None),


@@ -116,28 +121,36 @@ class Bcast(_Zmsg):
     def packed(self) -> bytes:
         return (
             pack(
     def packed(self) -> bytes:
         return (
             pack(

-                "!B16s16sd",
+                "!B16s16sd16s",

                 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,
                 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,

+                b"                "
+                if self.pmod is None
+                else self.pmod.encode(),

             )
             + pack_peer(self.peeraddr)
             + self.packet
         )
 
     def decode(self, buffer: bytes) -> None:
             )
             + pack_peer(self.peeraddr)
             + self.packet
         )
 
     def decode(self, buffer: bytes) -> None:

-        is_incoming, proto, imei, when = unpack("!B16s16sd", buffer[:41])
+        is_incoming, proto, imei, when, pmod = unpack(
+            "!B16s16sd16s", buffer[:57]
+        )

         self.is_incoming = bool(is_incoming)
         self.is_incoming = bool(is_incoming)

-        self.proto = proto.decode()
+        self.proto = proto.decode().rstrip("\0")

         self.imei = (
             None if imei == b"0000000000000000" else imei.decode().strip("\0")
         )
         self.when = when
         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:]
+        self.pmod = (
+            None if pmod == b"                " else pmod.decode().strip("\0")
+        )
+        self.peeraddr = unpack_peer(buffer[57:75])
+        self.packet = buffer[75:]

 
 
 class Resp(_Zmsg):
 
 
 class Resp(_Zmsg):


@@ -166,3 +179,28 @@ class Resp(_Zmsg):
 
         self.when = when
         self.packet = buffer[24:]
 
         self.when = when
         self.packet = buffer[24:]

+
+
+class Rept(_Zmsg):
+    """Broadcast zmq message with "rectified" proto-agnostic json data"""
+
+    KWARGS = (("imei", None), ("payload", ""))
+
+    @property
+    def packed(self) -> bytes:
+        return (
+            pack(
+                "16s",
+                b"0000000000000000"
+                if self.imei is None
+                else self.imei.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")
+        )
+        self.payload = buffer[16:].decode()