protobin 0.0.46__tar.gz → 0.0.48__tar.gz

{protobin-0.0.46 → protobin-0.0.48}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: protobin
-Version: 0.0.46
+Version: 0.0.48
 Summary: Python library for encode and decode data in protobin format
 Project-URL: Homepage, https://github.com/drmelectronic/protobin-python
 Project-URL: Bug Tracker, https://github.com/drmelectronic/protobin-python/issues

{protobin-0.0.46 → protobin-0.0.48}/protobin/fields.py

@@ -130,6 +130,27 @@ class ArrayField(FieldBase):
         return lista, binary
 
 
+
+class BinaryField(FieldBase):
+
+    def __init__(self, k, js):
+        super().__init__(k, js)
+        self.length_size = js.get('length_size', 1)
+
+    def __repr__(self):
+        return f'BinaryField<key: {self.key}, bytes: {self.bytes}>'
+
+    def from_binary(self, binary):
+        return binary
+
+    def split(self, binary):
+        bytes = int.from_bytes(binary[:self.length_size], 'big', signed=False)
+        return binary[self.length_size:bytes + self.length_size], binary[bytes + self.length_size:]
+
+    def to_binary(self, val):
+        return len(val).to_bytes(self.length_size, 'big') + val
+
+
 class BitsField(FieldBase):
     length: int
 
@@ -306,7 +327,10 @@ class DateTimeField(FieldBase):
         S, binary = self.get_nible(binary)
         if y == 0 and m == 0 and d == 0 and H == 0 and M == 0 and S == 0:
             return None
-        return datetime.datetime(2000 + y, m, d, H, M, S)
+        try:
+            return datetime.datetime(2000 + y, m, d, H, M, S)
+        except:
+            return None
 
 
 class FlagsField(FieldBase):
@@ -525,6 +549,7 @@ class UnsignedField(FieldBase):
 
 FIELD_MAP = {
     'array': ArrayField,
+    'binary': BinaryField,
     'bits': BitsField,
     'bool': BoolField,
     'char': CharField,

{protobin-0.0.46 → protobin-0.0.48}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "protobin"
-version = "0.0.46"
+version = "0.0.48"
 authors = [
     { name="Daniel Robles", email="drm.electronic@gmail.com" },
 ]

{protobin-0.0.46 → protobin-0.0.48}/tests/demo.json

@@ -20,6 +20,39 @@
                 "schedule": {"type": "time"}
             }
         },
+        "report_alt": {
+            "header": "p",
+            "client": {
+                "positions": {
+                    "type": "array", "array": {
+                        "time": {"type": "datetime"},
+                        "lng": {"bytes": 4, "type": "float", "decimals": 6},
+                        "lat": {"bytes": 4, "type": "float", "decimals": 6},
+                        "speed": {"bytes": 1, "type": "unsigned"},
+                        "mark": {"bytes": 2, "type": "id"},
+                        "busstop": {"bytes": 2, "type": "id"}
+                    }
+                },
+                "trip": {"bytes": 4, "type": "id"},
+                "route": {"bytes": 1, "type": "id"},
+                "direction": {"type": "bool"},
+                "state": {"type": "char"},
+                "boletos": {
+                    "type": "array", "array": {
+                        "id": { "bytes": 2, "type": "unsigned"},
+                        "cantidad": {"bytes": 2, "type": "unsigned"}
+                    }
+                },
+                "sales": {"bytes": 3, "type": "unsigned"},
+                "events": {"type": "array", "array": {
+                    "id": {"bytes": 2, "type": "unsigned"},
+                    "value": {"bytes": 1, "type": "unsigned"}}
+                }
+            },
+            "server": {
+                "positions": {"bytes":  1, "type":  "unsigned"}
+            }
+        },
         "report": {
             "header": "PV",
             "client": {

{protobin-0.0.46 → protobin-0.0.48}/tests/tests.py

@@ -83,6 +83,10 @@ class BasicTest(unittest.TestCase):
                 "header": "b",
                 "fields": {'test': {'type': 'bits', 'length': 7}}
             },
+            'binary': {
+                "header": "bin",
+                "fields": {'test': {'type': 'binary'}}
+            },
             'bool': {
                 "header": "BO",
                 "fields": {'test': {'bytes': 1, 'type': 'bool'}}
@@ -182,6 +186,45 @@ class BasicTest(unittest.TestCase):
         h, recv = self.protocol.decode(binary)
         self.assertEqual(data, recv)
 
+    def test_binary(self):
+        data = {'test': b'S=RA\x05'}
+        binary = self.protocol.encode(data, 'binary')
+        h, recv = self.protocol.decode(binary)
+        self.assertEqual(data, recv)
+
+    def test_command_binary(self):
+        data = {'test': None}
+        with self.assertRaises(ValueError) as er:
+            self.protocol.encode(data, 'unsigned')
+
+        protocol = Protocol(js={
+            "length": 8,
+            "fake_prefix": True,
+            "crc": {"poly":  "0x18005", "init":  "0x0000", "reverse": True, "byte_order":  "big", "size":  4},
+            'formats': {
+                "command": {
+                    "codec": 12,
+                    "fields": {
+                        "#commands1": {"bytes": 1, "type": "unsigned"},
+                        "type": {"bytes": 1, "type": "unsigned"},
+                        "command": {"length_size": 4, "type": "binary"},
+                        "#commands2": {"bytes": 1, "type": "unsigned"}
+                    }
+                }
+            }})
+        binary = b'S=RA\x05CERES07:42\x08HUACHIPA2\nPZA VITART\x00>\n\x00\x07\x01\x00\x041\x00&\r\x00\x00\x00\x00\x00\x00(\xc4'
+        data = {
+            '#commands1': 1,
+            'type': 5,
+            'command': binary,
+            '#commands2': 1,
+        }
+        binary = protocol.encode(data, 'command')
+        print(binary)
+        h, recv = protocol.decode(binary)
+        print(recv)
+        self.assertEqual(data, recv)
+
     def test_bits_false(self):
         data = {'test': [False, False]}
         binary = self.protocol.encode(data, 'bits')
@@ -918,3 +961,12 @@ report:
         binary = client.encode(data, 'flag_array')
         h, recv = client.decode(binary)
         self.assertEqual(data, recv)
+
+
+
+    def test_report_teltonika_alt(self):
+        server = Protocol(file='demo.json', server=True)
+        binary = b'p=\x03\x14\x07%\x10YP\xfbh.\x18\xffG\xaa\x8c\x18\x00\x16\xee\xfa\x14\x07%\x10YU\xfbh/\x06\xffG\xa9\xc6\x15\x00\x16\xee\xfay\x01\xe7$\xba\x10o}\x00\xf7\xc1m\x10\xc3R\n\xffh\xbb\x00\x04\x06\xf8\x01\x01R\x00\x00\x00\x00\x00'
+        h, recv = server.decode(binary)
+        self.assertEqual(h, 'report_alt')
+        print(recv)