fix #73: not block in the receiving loop (#74)

* fix #73: not block in the receiving loop

* rewrite

* grumble

* bugfix

* %s

jd4/api.py

@@ -1,6 +1,6 @@
 import json
 from aiohttp import ClientSession, CookieJar
-from asyncio import get_event_loop
+from asyncio import CancelledError, Queue, get_event_loop
 from appdirs import user_config_dir
 from os import path
 from urllib.parse import urljoin
@@ -57,10 +57,29 @@ async def post_json(self, relative_url, **kwargs):
     async def judge_consume(self, handler_type):
         async with self.ws_connect(self.full_url('judge/consume-conn/websocket')) as ws:
             logger.info('Connected')
-            async for msg in ws:
-                request = json.loads(msg.data)
-                await handler_type(self, request, ws).handle()
-            logger.warning('Connection lost with code %d', ws.close_code)
+            queue = Queue()
+            async def worker():
+                try:
+                    while True:
+                        request = await queue.get()
+                        await handler_type(self, request, ws).handle()
+                except CancelledError:
+                    raise
+                except Exception as e:
+                    logger.exception(e)
+                    await ws.close()
+            worker_task = get_event_loop().create_task(worker())
+            try:
+                while True:
+                    queue.put_nowait(await ws.receive_json())
+            except TypeError:
+                pass
+            logger.warning('Connection lost with code %s', ws.close_code)
+            worker_task.cancel()
+            try:
+                await worker_task
+            except CancelledError:
+                pass
 
     async def judge_noop(self):
         await self.get_json('judge/noop')