|
|
@@ -12,6 +12,7 @@ conn_manager = ConnectionManager()
|
|
|
active_connections = set()
|
|
|
device_ctrl = DeviceControl(websocket_manager=conn_manager)
|
|
|
blue_tooth = BlueToothMode(websocket_manager=conn_manager)
|
|
|
+from utils.common import message_queue
|
|
|
@app.websocket("/ws")
|
|
|
async def websocket_endpoint(websocket: WebSocket):
|
|
|
await conn_manager.connect(websocket)
|
|
|
@@ -33,7 +34,16 @@ async def websocket_endpoint(websocket: WebSocket):
|
|
|
await checkMcuConnection(device_ctrl)
|
|
|
async def connectBlueTooth():
|
|
|
await blue_tooth.main_func()
|
|
|
- await asyncio.gather(handler_messages(), checkConnMcu(), connectBlueTooth())
|
|
|
+ async def send_message():
|
|
|
+ while True:
|
|
|
+ try:
|
|
|
+ message = await message_queue.get()
|
|
|
+ await websocket.send_text(message)
|
|
|
+ except Exception as e:
|
|
|
+ print(e)
|
|
|
+ break
|
|
|
+
|
|
|
+ await asyncio.gather(handler_messages(), checkConnMcu(), connectBlueTooth(), send_message())
|
|
|
except WebSocketDisconnect:
|
|
|
# socket_manager.close()
|
|
|
print("Client disconnected")
|