X-Git-Url: http://www.average.org/gitweb/?a=blobdiff_plain;f=loctrkd%2Fbeesure.py;h=b3afae149e619875f7ec089a97690de182ba0459;hb=HEAD;hp=35682bd1028a8e0e0dcb7c7d96c356f7e1d8c8ac;hpb=c9f23958d20dfc6578b9f76706bd8b3e687389b0;p=loctrkd.git

diff --git a/loctrkd/beesure.py b/loctrkd/beesure.py
index 35682bd..b3afae1 100755
--- a/loctrkd/beesure.py
+++ b/loctrkd/beesure.py
@@ -43,6 +43,7 @@ __all__ = (
     "Respond",
 )
 
+PMODNAME = __name__.split(".")[-1]
 PROTO_PREFIX = "BS:"
 
 ### Deframer ###
@@ -116,7 +117,7 @@ class Stream:
             else:
                 msgs.append(
                     f"Packet does not end with ']'"
-                    f" at {self.datalen+20}: {self.buffer=!r}"
+                    f" at {self.datalen+20}: {self.buffer[:64]=!r}"
                 )
             self.buffer = self.buffer[self.datalen + 21 :]
             self.datalen = 0
@@ -312,6 +313,14 @@ class UNKNOWN(BeeSurePkt):
     pass
 
 
+class _SET_PHONE(BeeSurePkt):
+    OUT_KWARGS = (("phonenumber", str, ""),)
+
+    def out_encode(self) -> str:
+        self.phonenumber: str
+        return self.phonenumber
+
+
 class _LOC_DATA(BeeSurePkt):
     def in_decode(self, *args: str) -> None:
         p = SimpleNamespace()
@@ -373,7 +382,10 @@ class _LOC_DATA(BeeSurePkt):
         self.longitude = p.lon * p.eorw
 
     def rectified(self) -> Report:
-        if self.gps_valid:
+        # self.gps_valid is supposed to mean it, but it does not. Perfectly
+        # good looking coordinates, with ten satellites, still get 'V'.
+        # I suspect that in reality, 'A' means "hint data is absent".
+        if self.gps_valid or self.num_of_sats > 3:
             return CoordReport(
                 devtime=str(self.devtime),
                 battery_percentage=self.battery_percentage,
@@ -399,6 +411,14 @@ class AL(_LOC_DATA):
     RESPOND = Respond.INL
 
 
+class CALL(_SET_PHONE):
+    pass
+
+
+class CENTER(_SET_PHONE):
+    pass
+
+
 class CONFIG(BeeSurePkt):
     pass
 
@@ -407,6 +427,10 @@ class CR(BeeSurePkt):
     pass
 
 
+class FIND(BeeSurePkt):
+    pass
+
+
 class FLOWER(BeeSurePkt):
     OUT_KWARGS = (("number", int, 1),)
 
@@ -435,6 +459,13 @@ class LK(BeeSurePkt):
         return "LK"
 
 
+class LZ(BeeSurePkt):
+    OUT_KWARGS = (("language", int, 1), ("timezone", int, 0))
+
+    def out_encode(self) -> str:
+        return f"{self.language},{self.timezone}"
+
+
 class MESSAGE(BeeSurePkt):
     OUT_KWARGS = (("message", str, ""),)
 
@@ -442,6 +473,10 @@ class MESSAGE(BeeSurePkt):
         return str(self.message.encode("utf_16_be").hex())
 
 
+class MONITOR(BeeSurePkt):
+    pass
+
+
 class _PHB(BeeSurePkt):
     OUT_KWARGS: Tuple[Tuple[str, Callable[[Any], Any], Any], ...] = (
         ("entries", pblist, []),
@@ -481,14 +516,6 @@ class SOS(BeeSurePkt):
         return ",".join(self.phonenumbers)
 
 
-class _SET_PHONE(BeeSurePkt):
-    OUT_KWARGS = (("phonenumber", str, ""),)
-
-    def out_encode(self) -> str:
-        self.phonenumber: str
-        return self.phonenumber
-
-
 class SOS1(_SET_PHONE):
     pass
 
@@ -536,6 +563,13 @@ class UD2(_LOC_DATA):
     pass
 
 
+class UPLOAD(BeeSurePkt):
+    OUT_KWARGS = (("interval", int, 600),)
+
+    def out_encode(self) -> str:
+        return str(self.interval)
+
+
 # Build dicts protocol number -> class and class name -> protocol number
 CLASSES = {}
 if True:  # just to indent the code, sorry!
@@ -569,8 +603,15 @@ def proto_handled(proto: str) -> bool:
     return proto.startswith(PROTO_PREFIX)
 
 
+def _local_proto(packet: bytes) -> str:
+    try:
+        return packet[20:-1].split(b",")[0].decode()
+    except UnicodeDecodeError:
+        return "UNKNOWN"
+
+
 def proto_of_message(packet: bytes) -> str:
-    return PROTO_PREFIX + packet[20:-1].split(b",")[0].decode()
+    return PROTO_PREFIX + _local_proto(packet)
 
 
 def imei_from_packet(packet: bytes) -> Optional[str]:
@@ -585,7 +626,7 @@ def is_goodbye_packet(packet: bytes) -> bool:
 
 
 def inline_response(packet: bytes) -> Optional[bytes]:
-    proto = packet[20:-1].split(b",")[0].decode()
+    proto = _local_proto(packet)
     if proto in CLASSES:
         cls = CLASSES[proto]
         if cls.RESPOND is Respond.INL:
@@ -601,22 +642,28 @@ def parse_message(packet: bytes, is_incoming: bool = True) -> BeeSurePkt:
     """From a packet (without framing bytes) derive the XXX.In object"""
     toskip, vendor, imei, datalength = _framestart(packet)
     bsplits = packet[20:-1].split(b",", 1)
-    if len(bsplits) == 2:
+    try:
         proto = bsplits[0].decode("ascii")
+    except UnicodeDecodeError:
+        proto = str(bsplits[0])
+    if len(bsplits) == 2:
         rest = bsplits[1]
     else:
-        proto = ""
-        rest = bsplits[0]
+        rest = b""
     if proto in CLASSES:
         cls = CLASSES[proto].In if is_incoming else CLASSES[proto].Out
         payload = (
-            rest if cls.BINARY else rest.decode("Windows-1252").split(",")
+            # Some people encode their SSIDs in non-utf8
+            rest
+            if cls.BINARY
+            else rest.decode("Windows-1252").split(",")
         )
         try:
             return cls(vendor, imei, datalength, payload)
         except (DecodeError, ValueError, IndexError) as e:
             cause: Union[DecodeError, ValueError, IndexError] = e
     else:
+        payload = rest
         cause = ValueError(f"Proto {proto} is unknown")
     if is_incoming:
         retobj = UNKNOWN.In(vendor, imei, datalength, payload)
@@ -633,3 +680,13 @@ def exposed_protos() -> List[Tuple[str, bool]]:
         for cls in CLASSES.values()
         if hasattr(cls, "rectified")
     ]
+
+
+def make_response(cmd: str, imei: str, **kwargs: Any) -> Optional[BeeSurePkt]:
+    if cmd == "poweroff":
+        return POWEROFF.Out()
+    elif cmd == "refresh":
+        return MONITOR.Out()
+    elif cmd == "message":
+        return MESSAGE.Out(message=kwargs.get("txt", "Hello"))
+    return None