Fix loop not closing when client closes

By using aiohttp's built-in async iterator, we can ensure the loop is
properly closed when the client is sending a close request.

jsonrpc_websocket/jsonrpc.py

@@ -63,15 +63,10 @@ async def _ws_loop(self):
         """Listen for messages from the websocket server."""
         msg = None
         try:
-            while True:
-                msg = await self._client.receive()
-
-                if msg.type == aiohttp.WSMsgType.CLOSED:
-                    break
+            async for msg in self._client:
                 if msg.type == aiohttp.WSMsgType.ERROR:
                     break
-
-                if msg.type == aiohttp.WSMsgType.BINARY:
+                elif msg.type == aiohttp.WSMsgType.BINARY:
                     try:
                         # If we get a binary message, try and decode it as a
                         # UTF-8 JSON string, in case the server is sending

tests.py

@@ -7,6 +7,7 @@
 from unittest.mock import Mock
 
 import aiohttp
+from aiohttp import ClientWebSocketResponse
 import aiohttp.web
 import pep8
 import pytest
@@ -44,7 +45,7 @@ def receive(self, data):
     def receive_binary(self, data):
         self.test_server.test_binary(data)
 
-class JsonTestServer():
+class JsonTestServer(ClientWebSocketResponse):
     def __init__(self, loop=None):
         self.loop = loop
         self.send_handler = None
@@ -65,7 +66,7 @@ def test_error(self):
         self.receive_queue.put_nowait(aiohttp.WSMessage(aiohttp.WSMsgType.ERROR, 0, ''))
 
     def test_close(self):
-        self.receive_queue.put_nowait(aiohttp.WSMessage(aiohttp.WSMsgType.CLOSED, 0, ''))
+        self.receive_queue.put_nowait(aiohttp.WSMessage(aiohttp.WSMsgType.CLOSED, None, None))
 
     def test_ping(self):
         self.receive_queue.put_nowait(aiohttp.WSMessage(aiohttp.WSMsgType.PING, 0, ''))
@@ -79,7 +80,7 @@ async def receive(self):
     async def close(self):
         if not self._closed:
             self._closed = True
-            self.receive_queue.put_nowait(aiohttp.WSMessage(aiohttp.WSMsgType.CLOSED, 0, ''))
+            self.receive_queue.put_nowait(aiohttp.WSMessage(aiohttp.WSMsgType.CLOSING, None, None))
 
 
 def assertSameJSON(json1, json2):
@@ -144,7 +145,11 @@ def handler(server, data):
     assert isinstance(transport_error.value.args[1], asyncio.TimeoutError)
 
 async def test_client_closed(server):
+    assert server.session.run_loop_future.done() is False
     await server.close()
+    assert server.session.run_loop_future.done() is False
+    await server.session.run_loop_future
+    assert server.session.run_loop_future.done() is True
     with pytest.raises(TransportError, match='Client is not connected.'):
         def handler(server, data):
             pass