Add support for orjson (ikalchev#412)

pyhap/hap_handler.py

@@ -4,7 +4,6 @@
 """
 import asyncio
 from http import HTTPStatus
-import json
 import logging
 from urllib.parse import parse_qs, urlparse
 import uuid
@@ -25,7 +24,7 @@
 from pyhap.util import long_to_bytes
 
 from .hap_crypto import hap_hkdf, pad_tls_nonce
-from .util import to_hap_json
+from .util import to_hap_json, from_hap_json
 
 # iOS will terminate the connection if it does not respond within
 # 10 seconds, so we only allow 9 seconds to avoid this.
@@ -614,7 +613,7 @@ def handle_set_characteristics(self):
             self.send_response(HTTPStatus.UNAUTHORIZED)
             return
 
-        requested_chars = json.loads(self.request_body.decode("utf-8"))
+        requested_chars = from_hap_json(self.request_body.decode("utf-8"))
         logger.debug(
             "%s: Set characteristics content: %s", self.client_address, requested_chars
         )
@@ -639,7 +638,7 @@ def handle_prepare(self):
             self.send_response(HTTPStatus.UNAUTHORIZED)
             return
 
-        request = json.loads(self.request_body.decode("utf-8"))
+        request = from_hap_json(self.request_body.decode("utf-8"))
         logger.debug("%s: prepare content: %s", self.client_address, request)
 
         response = self.accessory_handler.prepare(request, self.client_address)
@@ -744,7 +743,7 @@ def _send_tlv_pairing_response(self, data):
 
     def handle_resource(self):
         """Get a snapshot from the camera."""
-        data = json.loads(self.request_body.decode("utf-8"))
+        data = from_hap_json(self.request_body.decode("utf-8"))
 
         if self.accessory_handler.accessory.category == CATEGORY_BRIDGE:
             accessory = self.accessory_handler.accessory.accessories.get(data["aid"])

pyhap/util.py

@@ -1,11 +1,12 @@
 import asyncio
 import base64
 import functools
-import json
 import random
 import socket
 from uuid import UUID
 
+import orjson
+
 from .const import BASE_UUID
 
 ALPHANUM = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"
@@ -157,9 +158,16 @@ def hap_type_to_uuid(hap_type):
 
 def to_hap_json(dump_obj):
     """Convert an object to HAP json."""
-    return json.dumps(dump_obj, separators=(",", ":")).encode("utf-8")
+    return orjson.dumps(dump_obj)  # pylint: disable=no-member
 
 
 def to_sorted_hap_json(dump_obj):
     """Convert an object to sorted HAP json."""
-    return json.dumps(dump_obj, sort_keys=True, separators=(",", ":")).encode("utf-8")
+    return orjson.dumps(  # pylint: disable=no-member
+        dump_obj, option=orjson.OPT_SORT_KEYS  # pylint: disable=no-member
+    )
+
+
+def from_hap_json(json_str):
+    """Convert json to an object."""
+    return orjson.loads(json_str)  # pylint: disable=no-member

requirements.txt

@@ -1,3 +1,5 @@
 h11
+chacha20poly1305-reuseable
 cryptography
+orjson
 zeroconf

requirements_all.txt

@@ -1,5 +1,6 @@
 base36
 cryptography
+orjson
 pyqrcode
 h11
 zeroconf

setup.py

@@ -22,7 +22,7 @@
     README = f.read()
 
 
-REQUIRES = ["cryptography", "chacha20poly1305-reuseable", "zeroconf>=0.36.2", "h11"]
+REQUIRES = ["cryptography", "chacha20poly1305-reuseable", "orjson>=3.7.2", "zeroconf>=0.36.2", "h11"]
 
 
 setup(