revert dispatch method override

Author: Archmonger

CHANGELOG.md

@@ -43,10 +43,6 @@ Using the following categories, list your changes in this order:
 -   ReactPy Websocket will now decode messages via `orjson` resulting in an ~6% overall performance boost.
 -   Built-in asyncio event loops are now patched via `nest_asyncio` to be re-enterant, resulting in an ~10% overall performance boost. This has no performance impact if you are running your webserver with `uvloop`.
 
-### Changed
-
--   Changed implementation of `REACTPY_BACKHAUL_THREAD` to attempt increased performance compatibility.
-
 ### Fixed
 
 -   Fix bug where `REACTPY_WEBSOCKET_URL` always generates a warning if unset.

src/reactpy_django/websocket/consumer.py

@@ -5,6 +5,7 @@
 import asyncio
 import contextlib
 import logging
+from concurrent.futures import Future
 from datetime import timedelta
 from threading import Thread
 from typing import Any, MutableMapping, Sequence
@@ -41,7 +42,7 @@ class ReactpyAsyncWebsocketConsumer(AsyncJsonWebsocketConsumer):
 
     async def connect(self) -> None:
         """The browser has connected."""
-        from reactpy_django.config import REACTPY_AUTH_BACKEND
+        from reactpy_django.config import REACTPY_AUTH_BACKEND, REACTPY_BACKHAUL_THREAD
 
         await super().connect()
 
@@ -77,36 +78,33 @@ async def connect(self) -> None:
             )
 
         # Start the component dispatcher
-        self.recv_queue: asyncio.Queue = asyncio.Queue()
-        self.dispatcher = asyncio.create_task(self.run_dispatcher())
+        self.dispatcher: Future | asyncio.Task
+        self.threaded = REACTPY_BACKHAUL_THREAD
+        if self.threaded:
+            if not backhaul_thread.is_alive():
+                await asyncio.to_thread(
+                    _logger.debug, "Starting ReactPy backhaul thread."
+                )
+                backhaul_thread.start()
+            self.dispatcher = asyncio.run_coroutine_threadsafe(
+                self.run_dispatcher(), backhaul_loop
+            )
+        else:
+            self.dispatcher = asyncio.create_task(self.run_dispatcher())
 
     async def disconnect(self, code: int) -> None:
         """The browser has disconnected."""
         self.dispatcher.cancel()
-        await self.dispatcher
         await super().disconnect(code)
 
     async def receive_json(self, content: Any, **_) -> None:
         """Receive a message from the browser. Typically, messages are event signals."""
-        await self.recv_queue.put(content)
-
-    async def dispatch(self, message):
-        """Override the Django Channels dispatch method to allow running the ASGI
-        dispatcher in a thread."""
-        from reactpy_django.config import REACTPY_BACKHAUL_THREAD
-
-        if REACTPY_BACKHAUL_THREAD:
-            if not backhaul_thread.is_alive():
-                await asyncio.to_thread(
-                    _logger.debug, "Starting ReactPy backhaul thread."
-                )
-                backhaul_thread.start()
-
-            return asyncio.run_coroutine_threadsafe(
-                super().dispatch(message), backhaul_loop
-            ).result()
-
-        return await super().dispatch(message)
+        if self.threaded:
+            asyncio.run_coroutine_threadsafe(
+                self.recv_queue.put(content), backhaul_loop
+            )
+        else:
+            await self.recv_queue.put(content)
 
     @classmethod
     async def decode_json(cls, text_data):
@@ -128,6 +126,7 @@ async def run_dispatcher(self):
         dotted_path = scope["url_route"]["kwargs"]["dotted_path"]
         uuid = scope["url_route"]["kwargs"]["uuid"]
         search = scope["query_string"].decode()
+        self.recv_queue: asyncio.Queue = asyncio.Queue()
         connection = Connection(  # For `use_connection`
             scope=scope,
             location=Location(