Add orjson as an optional speedup and allow to pass custom json.dumps and json.loads functions to all components.

README.md

@@ -182,7 +182,7 @@ other internal settings in the interpreter.
 
 If you have a C compiler (Microsoft VC++ Redistributable 14.0 or newer, or a modern copy of GCC/G++, Clang, etc), it is
 recommended you install Hikari using `pip install -U hikari[speedups]`. This will install `aiohttp` with its available
-speedups, and `ciso8601` which will provide you with a small performance boost.
+speedups, `ciso8601` and `orjson` which will provide you with a substantial performance boost.
 
 ### `uvloop`
 

changes/1486.feature.md

@@ -0,0 +1 @@
+Add `orjson` as an optional speedup and allow to pass custom `json.dumps` and `json.loads` functions to all components.

hikari/errors.py

@@ -51,6 +51,7 @@
 )
 
 import http
+import json
 import typing
 
 import attr
@@ -317,7 +318,8 @@ def __str__(self) -> str:
             try:
                 value += _dump_errors(self.errors).strip("\n")
             except KeyError:
-                value += data_binding.dump_json(self.errors, indent=2)
+                # Use the stdlib json.dumps here to be able to indent
+                value += json.dumps(self.errors, indent=2)
 
         self._cached_str = value
         return value

hikari/impl/bot.py

@@ -51,6 +51,7 @@
 from hikari.impl import shard as shard_impl
 from hikari.impl import voice as voice_impl
 from hikari.internal import aio
+from hikari.internal import data_binding
 from hikari.internal import signals
 from hikari.internal import time
 from hikari.internal import ux
@@ -237,6 +238,10 @@ class GatewayBot(traits.GatewayBotAware):
     proxy_settings : typing.Optional[hikari.impl.config.ProxySettings]
         Custom proxy settings to use with network-layer logic
         in your application to get through an HTTP-proxy.
+    dumps : hikari.internal.data_binding.JSONEncoder
+        The JSON encoder this application should use. Defaults to `hikari.internal.data_binding.default_json_dumps`.
+    loads : hikari.internal.data_binding.JSONDecoder
+        The JSON decoder this application should use. Defaults to `hikari.internal.data_binding.default_json_loads`.
     rest_url : typing.Optional[str]
         Defaults to the Discord REST API URL if `None`. Can be
         overridden if you are attempting to point to an unofficial endpoint, or
@@ -291,6 +296,8 @@ class GatewayBot(traits.GatewayBotAware):
         "_shards",
         "_token",
         "_voice",
+        "_loads",
+        "_dumps",
         "shards",
     )
 
@@ -305,6 +312,8 @@ def __init__(
         force_color: bool = False,
         cache_settings: typing.Optional[config_impl.CacheSettings] = None,
         http_settings: typing.Optional[config_impl.HTTPSettings] = None,
+        dumps: data_binding.JSONEncoder = data_binding.default_json_dumps,
+        loads: data_binding.JSONDecoder = data_binding.default_json_loads,
         intents: intents_.Intents = intents_.Intents.ALL_UNPRIVILEGED,
         auto_chunk_members: bool = True,
         logs: typing.Union[None, int, str, typing.Dict[str, typing.Any]] = "INFO",
@@ -326,6 +335,8 @@ def __init__(
         self._intents = intents
         self._proxy_settings = proxy_settings if proxy_settings is not None else config_impl.ProxySettings()
         self._token = token.strip()
+        self._dumps = dumps
+        self._loads = loads
 
         # Caching
         cache_settings = cache_settings if cache_settings is not None else config_impl.CacheSettings()
@@ -357,6 +368,8 @@ def __init__(
             http_settings=self._http_settings,
             max_rate_limit=max_rate_limit,
             proxy_settings=self._proxy_settings,
+            dumps=dumps,
+            loads=loads,
             rest_url=rest_url,
             max_retries=max_retries,
             token=token,
@@ -1252,6 +1265,8 @@ async def _start_one_shard(
             event_manager=self._event_manager,
             event_factory=self._event_factory,
             intents=self._intents,
+            dumps=self._dumps,
+            loads=self._loads,
             initial_activity=activity,
             initial_is_afk=afk,
             initial_idle_since=idle_since,

hikari/impl/interaction_server.py

@@ -142,7 +142,7 @@ def status_code(self) -> int:
 
 # Constant response
 _PONG_RESPONSE: typing.Final[_Response] = _Response(
-    _OK_STATUS, data_binding.dump_json({"type": _PONG_RESPONSE_TYPE}).encode(), content_type=_JSON_CONTENT_TYPE
+    _OK_STATUS, data_binding.dump_json({"type": _PONG_RESPONSE_TYPE}, encode=True), content_type=_JSON_CONTENT_TYPE
 )
 
 
@@ -193,10 +193,10 @@ class InteractionServer(interaction_server.InteractionServer):
 
     Other Parameters
     ----------------
-    dumps : aiohttp.typedefs.JSONEncoder
-        The JSON encoder this server should use. Defaults to `json.dumps`.
-    loads : aiohttp.typedefs.JSONDecoder
-        The JSON decoder this server should use. Defaults to `json.loads`.
+    dumps : hikari.internal.data_binding.JSONEncoder
+        The JSON encoder this server should use. Defaults to `hikari.internal.data_binding.default_json_dumps`.
+    loads : hikari.internal.data_binding.JSONDecoder
+        The JSON decoder this server should use. Defaults to `hikari.internal.data_binding.default_json_loads`.
     public_key : bytes
         The public key this server should use for verifying request payloads from
         Discord. If left as `None` then the client will try to work this
@@ -224,10 +224,10 @@ class InteractionServer(interaction_server.InteractionServer):
     def __init__(
         self,
         *,
-        dumps: aiohttp.typedefs.JSONEncoder = data_binding.dump_json,
+        dumps: data_binding.JSONEncoder = data_binding.default_json_dumps,
         entity_factory: entity_factory_api.EntityFactory,
         executor: typing.Optional[concurrent.futures.Executor] = None,
-        loads: aiohttp.typedefs.JSONDecoder = data_binding.load_json,
+        loads: data_binding.JSONDecoder = data_binding.default_json_loads,
         rest_client: rest_api.RESTClient,
         public_key: typing.Optional[bytes] = None,
     ) -> None:
@@ -433,10 +433,11 @@ async def on_interaction(self, body: bytes, signature: bytes, timestamp: bytes)
             return _Response(_BAD_REQUEST_STATUS, b"Invalid request signature")
 
         try:
-            payload = self._loads(body.decode("utf-8"))
+            payload = self._loads(body)
+            assert isinstance(payload, dict)
             interaction_type = int(payload["type"])
 
-        except (data_binding.JSONDecodeError, ValueError, TypeError) as exc:
+        except (ValueError, TypeError) as exc:
             _LOGGER.error("Received a request with an invalid JSON body", exc_info=exc)
             return _Response(_BAD_REQUEST_STATUS, b"Invalid JSON body")
 
@@ -476,15 +477,15 @@ async def on_interaction(self, body: bytes, signature: bytes, timestamp: bytes)
                     result = await call
 
                 raw_payload, files = result.build(self._entity_factory)
-                payload = self._dumps(raw_payload)
+                payload = data_binding.dump_json(raw_payload, encode=True, json_dumps=self._dumps)
 
             except Exception as exc:
                 asyncio.get_running_loop().call_exception_handler(
                     {"message": "Exception occurred during interaction dispatch", "exception": exc}
                 )
                 return _Response(_INTERNAL_SERVER_ERROR_STATUS, b"Exception occurred during interaction dispatch")
 
-            return _Response(_OK_STATUS, payload.encode(), files=files, content_type=_JSON_CONTENT_TYPE)
+            return _Response(_OK_STATUS, payload, files=files, content_type=_JSON_CONTENT_TYPE)
 
         _LOGGER.debug(
             "Ignoring interaction %s of type %s without registered listener", interaction.id, interaction.type