idk

modules/web.py

@@ -107,11 +107,6 @@ def websocket_server_process(shared_data: dict, imc_q: multiprocessing.Queue, ws
     # create the asyncio loop and run server
     async def runner():
         clients = set()
-        stop_evt = asyncio.Event()
-
-        async def shutdown_watcher():
-            await loop.run_in_executor(None, shutdown_evt.wait)
-            stop_evt.set()
 
         async def handler_wrapper(websocket: ServerConnection):
             # register client
@@ -139,9 +134,9 @@ def websocket_server_process(shared_data: dict, imc_q: multiprocessing.Queue, ws
         # start server
         server = await websockets.serve(handler_wrapper, "0.0.0.0", 3001, server_header="RadioPlayer ws plugin", process_request=process_request)
         broadcaster = asyncio.create_task(broadcast_worker(ws_q, clients))
-        watcher = asyncio.create_task(shutdown_watcher())
 
-        await stop_evt.wait()
+        shutdown_evt.wait()
+        server.close()
 
         ws_q.put(None)
         broadcaster.cancel()
@@ -150,8 +145,6 @@ def websocket_server_process(shared_data: dict, imc_q: multiprocessing.Queue, ws
         await server.wait_closed()
 
         await broadcaster
-        watcher.cancel()
-        await watcher
 
     loop = asyncio.new_event_loop()
     asyncio.set_event_loop(loop)