cleanup framing/deframing of beesure

[loctrkd.git] / loctrkd / collector.py

diff --git a/loctrkd/collector.py b/loctrkd/collector.py
index 136ecba99aeeb602ee85028caadc0caa0caf744d..98345007b708ad446c80c39d04d42fe7c52fd6e1 100644 (file)
--- a/loctrkd/collector.py
+++ b/loctrkd/collector.py
@@ -27,16 +27,16 @@ MAXBUFFER: int = 4096
 
 class ProtoModule:
     class Stream:
-        @staticmethod
-        def enframe(buffer: bytes, imei: Optional[str] = None) -> bytes:
-            ...
-
         def recv(self, segment: bytes) -> List[Union[bytes, str]]:
             ...
 
         def close(self) -> bytes:
             ...
 
+    @staticmethod
+    def enframe(buffer: bytes, imei: Optional[str] = None) -> bytes:
+        ...
+
     @staticmethod
     def probe_buffer(buffer: bytes) -> bool:
         ...
@@ -139,9 +139,9 @@ class Client:
         return msgs
 
     def send(self, buffer: bytes) -> None:
-        assert self.stream is not None
+        assert self.stream is not None and self.pmod is not None
         try:
-            self.sock.send(self.stream.enframe(buffer, imei=self.imei))
+            self.sock.send(self.pmod.enframe(buffer, imei=self.imei))
         except OSError as e:
             log.error(
                 "Sending to fd %d (IMEI %s): %s",