Use tornado instead of simple http and websockets

Signed-off-by: Ygal Blum <[email protected]>

pyproject.toml

@@ -8,10 +8,10 @@ readme = "README.md"
 
 [tool.poetry.dependencies]
 python = "^3.11"
-websockets = "^12.0"
 injector = "^0.21.0"
 pydantic = "^2.7.4"
 envyaml = "^1.10.211231"
+tornado = "^6.4.1"
 
 
 [build-system]

requirements.txt

@@ -1,4 +1,4 @@
-websockets==12.0
 injector==0.21.0
 pydantic==2.7.4
 envyaml==1.10.211231
+tornado==6.4.1

slack_server_mock/__main__.py

@@ -1,19 +1,16 @@
 """ Application """
-import asyncio
+import tornado
 
 from slack_server_mock.servers.http.server import start_http_server, stop_http_server
-from slack_server_mock.servers.websocket.server import start_websocket_server
+from slack_server_mock.servers.websocket.server import start_websocket_server, stop_websocket_server
 
 
-loop = asyncio.new_event_loop()
-websocket_server_task = loop.create_task(start_websocket_server())
-loop.run_in_executor(None, start_http_server)
+start_websocket_server()
+start_http_server()
 try:
-    loop.run_forever()
+    tornado.ioloop.IOLoop.current().start()
 except KeyboardInterrupt:
-    print("Shutting down servers")
+    print("Shutting down")
 finally:
-    websocket_server_task.cancel()
-    loop.run_until_complete(websocket_server_task)
     stop_http_server()
-    loop.close()
+    stop_websocket_server()

slack_server_mock/actor/actor.py

@@ -1,9 +1,8 @@
 """ Slack Actor """
-import asyncio
 import json
 
 from injector import inject, singleton
-from websockets.server import WebSocketServerProtocol
+from tornado.websocket import WebSocketHandler
 
 from slack_server_mock.settings.settings import Settings
 
@@ -18,10 +17,10 @@ def __init__(self, settings: Settings) -> None:
         self._counter = 0
         self._websocket = None
 
-    async def app_connected(self, websocket: WebSocketServerProtocol):
+    def app_connected(self, websocket: WebSocketHandler):
         """ Notify the actor that the application connected """
         self._websocket = websocket
-        await self._websocket.send(self._wrap_message_with_envelope(self._conversation[0]['question']))
+        self._websocket.write_message(self._wrap_message_with_envelope(self._conversation[0]['question']))
 
     def message_received(self, msg: str):
         """ Notify the actor that the application sent a message """
@@ -32,19 +31,12 @@ def message_received(self, msg: str):
         self._conversation[self._counter]['answer'] = msg
         self._counter += 1
         if self._counter < len(self._conversation):
-            self._send_response()
+            self._websocket.write_message(
+                self._wrap_message_with_envelope(self._conversation[self._counter]['question'])
+            )
         else:
             self._dump_conversation()
 
-    def _send_response(self):
-        loop = asyncio.new_event_loop()
-        asyncio.set_event_loop(loop)
-        loop.run_until_complete(self._do_send_response())
-        loop.close()
-
-    async def _do_send_response(self):
-        await self._websocket.send(self._wrap_message_with_envelope(self._conversation[self._counter]['question']))
-
     def _dump_conversation(self):
         with open(self._output, "+w", encoding="utf-8") as f:
             json.dump(self._conversation, f)