Fix msgpack compatibility issues

svpcom · Oct 1, 2024 · cd9153c · cd9153c
1 parent 397faaf
commit cd9153c
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 6 deletions.
diff --git a/wfb_ng/cli.py b/wfb_ng/cli.py
@@ -145,7 +145,7 @@ class AntennaStat(Int32StringReceiver):
     temp_overheat_warning = settings.common.temp_overheat_warning
 
     def stringReceived(self, string):
-        attrs = msgpack.unpackb(string, strict_map_key=False, use_list=False)
+        attrs = msgpack.unpackb(string, strict_map_key=False, use_list=False, raw=False)
 
         if attrs['type'] == 'rx':
             self.draw_rx(attrs)

diff --git a/wfb_ng/log_parser.py b/wfb_ng/log_parser.py
@@ -24,7 +24,7 @@ def main():
                 if len(data) < data_len:
                     break
 
-                msg =  msgpack.unpackb(data, strict_map_key=False, use_list=False)
+                msg =  msgpack.unpackb(data, strict_map_key=False, use_list=False, raw=False)
                 ts = msg.pop('timestamp')
                 mtype = msg.pop('type')
 

diff --git a/wfb_ng/protocols.py b/wfb_ng/protocols.py
@@ -54,7 +54,8 @@ def connectionMade(self):
                                            cli_title=self.factory.cli_title or "",
                                            is_cluster=self.factory.is_cluster,
                                            log_interval=settings.common.log_interval,
-                                           temp_overheat_warning=settings.common.temp_overheat_warning)))
+                                           temp_overheat_warning=settings.common.temp_overheat_warning),
+                                      use_bin_type=True))
 
         self.factory.ui_sessions.append(self)
 
@@ -65,7 +66,7 @@ def connectionLost(self, reason):
         self.factory.ui_sessions.remove(self)
 
     def send_stats(self, data):
-        self.sendString(msgpack.packb(data))
+        self.sendString(msgpack.packb(data, use_bin_type=True))
 
 
 class RFTempMeter(object):

diff --git a/wfb_ng/server.py b/wfb_ng/server.py
@@ -55,7 +55,7 @@ class BinLogger(ErrorSafeLogFile):
     log_cls = BinLogFile
 
     def send_stats(self, data):
-        data = msgpack.packb(data)
+        data = msgpack.packb(data, use_bin_type=True)
         self.write(b''.join((struct.pack('!I', len(data)), data)))
 
 

diff --git a/wfb_ng/tests/test_twisted.py b/wfb_ng/tests/test_twisted.py
@@ -1,7 +1,12 @@
 from twisted.trial import unittest
 from twisted.internet import reactor
-
+import msgpack
 
 class ClockTestCase(unittest.TestCase):
     def test_reactor_has_monitonic_clock(self):
         self.assertLess(reactor.seconds(), 1000000000)
+
+    def test_msgpack(self):
+        a = ({(1, '2') : (b'spam', 'eggs')},)
+        b = msgpack.unpackb(msgpack.packb(a, use_bin_type=True), raw=False, strict_map_key=False, use_list=False)
+        self.assertEqual(a, b)