From 7398a3fc4726fa20b34840967a6c3777eef12f52 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Fri, 7 Oct 2022 06:57:53 -1000
Subject: [PATCH] feat: unpack header names as message kwargs (#82)

---
 .github/workflows/ci.yml                |  2 +-
 src/dbus_fast/_private/unmarshaller.pxd |  1 +
 src/dbus_fast/_private/unmarshaller.py  | 45 +++++++++++--------------
 3 files changed, 22 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index af2587f..fab6b9c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -65,7 +65,7 @@ jobs:
             poetry install
           fi
       - name: Test with Pytest
-        run: export $(dbus-launch); poetry run pytest --cov-report=xml
+        run: export $(dbus-launch); poetry run pytest --cov-report=xml --timeout=5
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v3
         with:
diff --git a/src/dbus_fast/_private/unmarshaller.pxd b/src/dbus_fast/_private/unmarshaller.pxd
index 7dccb07..76fba2d 100644
--- a/src/dbus_fast/_private/unmarshaller.pxd
+++ b/src/dbus_fast/_private/unmarshaller.pxd
@@ -21,6 +21,7 @@ cdef unsigned int HEADER_ARRAY_OF_STRUCT_SIGNATURE_POSITION
 cdef unsigned int HEADER_SIGNATURE_SIZE
 cdef unsigned int LITTLE_ENDIAN
 cdef unsigned int BIG_ENDIAN
+cdef unsigned int PROTOCOL_VERSION
 cdef str UINT32_CAST
 cdef str INT16_CAST
 
diff --git a/src/dbus_fast/_private/unmarshaller.py b/src/dbus_fast/_private/unmarshaller.py
index 4e05c1f..078e49a 100644
--- a/src/dbus_fast/_private/unmarshaller.py
+++ b/src/dbus_fast/_private/unmarshaller.py
@@ -9,13 +9,7 @@ from ..constants import MESSAGE_FLAG_MAP, MESSAGE_TYPE_MAP
 from ..errors import InvalidMessageError
 from ..message import Message
 from ..signature import SignatureType, Variant, get_signature_tree
-from .constants import (
-    BIG_ENDIAN,
-    HEADER_NAME_MAP,
-    LITTLE_ENDIAN,
-    PROTOCOL_VERSION,
-    HeaderField,
-)
+from .constants import BIG_ENDIAN, LITTLE_ENDIAN, PROTOCOL_VERSION, HeaderField
 
 IS_LITTLE_ENDIAN = sys.byteorder == "little"
 IS_BIG_ENDIAN = sys.byteorder == "big"
@@ -54,14 +48,19 @@ UINT32_UNPACK_BY_ENDIAN = {
 HEADER_SIGNATURE_SIZE = 16
 HEADER_ARRAY_OF_STRUCT_SIGNATURE_POSITION = 12
 
-HEADER_DESTINATION = HeaderField.DESTINATION.name
-HEADER_PATH = HeaderField.PATH.name
-HEADER_INTERFACE = HeaderField.INTERFACE.name
-HEADER_MEMBER = HeaderField.MEMBER.name
-HEADER_ERROR_NAME = HeaderField.ERROR_NAME.name
-HEADER_REPLY_SERIAL = HeaderField.REPLY_SERIAL.name
-HEADER_SENDER = HeaderField.SENDER.name
-HEADER_SIGNATURE = HeaderField.SIGNATURE.name
+
+HEADER_MESSAGE_ARG_NAME = {
+    1: "path",
+    2: "interface",
+    3: "member",
+    4: "error_name",
+    5: "reply_serial",
+    6: "destination",
+    7: "sender",
+    8: "signature",
+    9: "unix_fds",
+}
+
 
 READER_TYPE = Callable[["Unmarshaller", SignatureType], Any]
 
@@ -354,8 +353,9 @@ class Unmarshaller:
             o = self._pos + 1
             self._pos += signature_len + 2  # one for the byte, one for the '\0'
             tree = get_signature_tree(self._buf[o : o + signature_len].decode())
-            headers[HEADER_NAME_MAP[field_0]] = self._readers[tree.types[0].token](
-                self, tree.types[0]
+            type_ = tree.types[0]
+            headers[HEADER_MESSAGE_ARG_NAME[field_0]] = self._readers[type_.token](
+                self, type_
             )
         return headers
 
@@ -400,17 +400,12 @@ class Unmarshaller:
         self._pos = HEADER_ARRAY_OF_STRUCT_SIGNATURE_POSITION
         header_fields = self.header_fields(self._header_len)
         self._pos += -self._pos & 7  # align 8
-        tree = get_signature_tree(header_fields.get(HEADER_SIGNATURE, ""))
+        header_fields.pop("unix_fds", None)  # defined by self._unix_fds
+        tree = get_signature_tree(header_fields.pop("signature", ""))
         self._message = Message(
-            destination=header_fields.get(HEADER_DESTINATION),
-            path=header_fields.get(HEADER_PATH),
-            interface=header_fields.get(HEADER_INTERFACE),
-            member=header_fields.get(HEADER_MEMBER),
+            **header_fields,
             message_type=MESSAGE_TYPE_MAP[self._message_type],
             flags=MESSAGE_FLAG_MAP[self._flag],
-            error_name=header_fields.get(HEADER_ERROR_NAME),
-            reply_serial=header_fields.get(HEADER_REPLY_SERIAL),
-            sender=header_fields.get(HEADER_SENDER),
             unix_fds=self._unix_fds,
             signature=tree,
             body=[self._readers[t.token](self, t) for t in tree.types]