- add subscription via MessageDispatcher

ws/client/ws_client.py

@@ -8,9 +8,9 @@ from ws.connection import IConnection
 
 
 class WsClient:
-	def __init__(self, listener: IConnection):
+	def __init__(self, listener: IConnection, loop=None):
 		self.listener = listener
-		self.loop = asyncio.new_event_loop()
+		self.loop = loop
 		self.stop = None
 		self.bg_thread = None
 
@@ -44,7 +44,7 @@ class WsClient:
 			return
 
 		print("handler: got connection to {}".format(websocket.remote_address))
-		self.listener.on_connect(self.loop)
+		await self.listener.on_connect()
 		try:
 			path = "/"
 			consumer_task = asyncio.ensure_future(self.handler_recv(websocket, path), loop=self.loop)
@@ -55,7 +55,7 @@ class WsClient:
 		finally:
 			print("handler: lost connection from {}".format(websocket.remote_address))
 			await websocket.close()
-			self.listener.on_disconnect()
+			await self.listener.on_disconnect()
 
 	async def handler_recv(self, websocket, path):
 		while True: