cleanup framing/deframing of beesure

[loctrkd.git] / loctrkd / zx303proto.py

diff --git a/loctrkd/zx303proto.py b/loctrkd/zx303proto.py
index efb02d249f6c118185ce2a66b23675c9acf85efd..c47c216134c1e6ff737d01c4107c79351c3c07ea 100755 (executable)
--- a/loctrkd/zx303proto.py
+++ b/loctrkd/zx303proto.py
@@ -81,7 +81,7 @@ __all__ = (
     "UNKNOWN_B3",
 )
 
-PROTO_PREFIX = "ZX"
+PROTO_PREFIX = "ZX:"
 
 ### Deframer ###
 
@@ -92,10 +92,6 @@ class Stream:
     def __init__(self) -> None:
         self.buffer = b""
 
-    @staticmethod
-    def enframe(buffer: bytes) -> bytes:
-        return b"xx" + buffer + b"\r\n"
-
     def recv(self, segment: bytes) -> List[Union[bytes, str]]:
         """
         Process next segment of the stream. Return successfully deframed
@@ -150,6 +146,10 @@ class Stream:
         return ret
 
 
+def enframe(buffer: bytes, imei: Optional[str] = None) -> bytes:
+    return b"xx" + buffer + b"\r\n"
+
+
 ### Parser/Constructor ###
 
 
@@ -876,15 +876,9 @@ def class_by_prefix(
 
 
 def proto_name(obj: Union[MetaPkt, GPS303Pkt]) -> str:
-    return (
-        PROTO_PREFIX
-        + ":"
-        + (
-            obj.__class__.__name__
-            if isinstance(obj, GPS303Pkt)
-            else obj.__name__
-        )
-    ).ljust(16, "\0")[:16]
+    return PROTO_PREFIX + (
+        obj.__class__.__name__ if isinstance(obj, GPS303Pkt) else obj.__name__
+    )
 
 
 def proto_by_name(name: str) -> int: