changed compression algorithm

modem/arq_data_type_handler.py

@@ -3,14 +3,15 @@
 import structlog
 import lzma
 import gzip
+import zlib
 from message_p2p import message_received, message_failed, message_transmitted
 from enum import Enum
 
 class ARQ_SESSION_TYPES(Enum):
     raw = 0
     raw_lzma = 10
     raw_gzip = 11
-    p2pmsg_lzma = 20
+    p2pmsg_zlib = 20
     p2p_connection = 30
 
 class ARQDataTypeHandler:
@@ -38,11 +39,11 @@ def __init__(self, event_manager, state_manager):
                 'failed': self.failed_raw_gzip,
                 'transmitted': self.transmitted_raw_gzip,
             },
-            ARQ_SESSION_TYPES.p2pmsg_lzma: {
-                'prepare': self.prepare_p2pmsg_lzma,
-                'handle': self.handle_p2pmsg_lzma,
-                'failed' : self.failed_p2pmsg_lzma,
-                'transmitted': self.transmitted_p2pmsg_lzma,
+            ARQ_SESSION_TYPES.p2pmsg_zlib: {
+                'prepare': self.prepare_p2pmsg_zlib,
+                'handle': self.handle_p2pmsg_zlib,
+                'failed' : self.failed_p2pmsg_zlib,
+                'transmitted': self.transmitted_p2pmsg_zlib,
             },
             ARQ_SESSION_TYPES.p2p_connection: {
                 'prepare': self.prepare_p2p_connection,
@@ -148,25 +149,39 @@ def transmitted_raw_gzip(self, data, statistics):
         decompressed_data = gzip.decompress(data)
         return decompressed_data
 
-    def prepare_p2pmsg_lzma(self, data):
+    def prepare_p2pmsg_zlib(self, data):
         compressed_data = lzma.compress(data)
-        self.log(f"Preparing LZMA compressed P2PMSG data: {len(data)} Bytes >>> {len(compressed_data)} Bytes")
+
+        compressor = zlib.compressobj(level=6, wbits=-zlib.MAX_WBITS, strategy=zlib.Z_FILTERED)
+        compressed_data = compressor.compress(data) + compressor.flush()
+
+        self.log(f"Preparing ZLIB compressed P2PMSG data: {len(data)} Bytes >>> {len(compressed_data)} Bytes")
         return compressed_data
 
-    def handle_p2pmsg_lzma(self, data, statistics):
-        decompressed_data = lzma.decompress(data)
-        self.log(f"Handling LZMA compressed P2PMSG data: {len(decompressed_data)} Bytes from {len(data)} Bytes")
+    def handle_p2pmsg_zlib(self, data, statistics):
+        decompressor = zlib.decompressobj(wbits=-zlib.MAX_WBITS)
+        decompressed_data = decompressor.decompress(data)
+        decompressed_data += decompressor.flush()
+
+        self.log(f"Handling ZLIB compressed P2PMSG data: {len(decompressed_data)} Bytes from {len(data)} Bytes")
         message_received(self.event_manager, self.state_manager, decompressed_data, statistics)
         return decompressed_data
 
-    def failed_p2pmsg_lzma(self, data, statistics):
-        decompressed_data = lzma.decompress(data)
-        self.log(f"Handling failed LZMA compressed P2PMSG data: {len(decompressed_data)} Bytes from {len(data)} Bytes", isWarning=True)
+    def failed_p2pmsg_zlib(self, data, statistics):
+        decompressor = zlib.decompressobj(wbits=-zlib.MAX_WBITS)
+        decompressed_data = decompressor.decompress(data)
+        decompressed_data += decompressor.flush()
+
+        self.log(f"Handling failed ZLIB compressed P2PMSG data: {len(decompressed_data)} Bytes from {len(data)} Bytes", isWarning=True)
         message_failed(self.event_manager, self.state_manager, decompressed_data, statistics)
         return decompressed_data
 
-    def transmitted_p2pmsg_lzma(self, data, statistics):
-        decompressed_data = lzma.decompress(data)
+    def transmitted_p2pmsg_zlib(self, data, statistics):
+        # Create a decompression object with the same wbits setting used for compression
+        decompressor = zlib.decompressobj(wbits=-zlib.MAX_WBITS)
+        decompressed_data = decompressor.decompress(data)
+        decompressed_data += decompressor.flush()
+
         message_transmitted(self.event_manager, self.state_manager, decompressed_data, statistics)
         return decompressed_data
 

modem/command_message_send.py

@@ -41,7 +41,7 @@ def transmit(self, modem):
             # Convert JSON string to bytes (using UTF-8 encoding)
             payload = message.to_payload().encode('utf-8')
             json_bytearray = bytearray(payload)
-            data, data_type = self.arq_data_type_handler.prepare(json_bytearray, ARQ_SESSION_TYPES.p2pmsg_lzma)
+            data, data_type = self.arq_data_type_handler.prepare(json_bytearray, ARQ_SESSION_TYPES.p2pmsg_zlib)
 
             iss = ARQSessionISS(self.config,
                                 modem,