Merge pull request #256 from quantmind/ls-ws

Websocket fixes

openapi/__init__.py

@@ -1,3 +1,3 @@
 """Minimal OpenAPI asynchronous server application"""
 
-__version__ = "2.1.0"
+__version__ = "2.1.1"

openapi/ws/errors.py

@@ -1,3 +1,6 @@
+import asyncio
+
+
 class CannotSubscribe(RuntimeError):
     """Raised by a :class:`.ServiceManager`.
 
@@ -12,3 +15,11 @@ class ChannelCallbackError(RuntimeError):
 
 class CannotPublish(RuntimeError):
     """Raised when not possible to publish event into channels"""
+
+
+CONNECTION_ERRORS = (
+    asyncio.CancelledError,
+    asyncio.TimeoutError,
+    RuntimeError,
+    ConnectionResetError,
+)

openapi/ws/path.py

@@ -1,4 +1,3 @@
-import asyncio
 import hashlib
 import logging
 import time
@@ -12,6 +11,7 @@
 from .. import json
 from ..data.validate import ValidationErrors, validated_schema
 from ..utils import compact
+from .errors import CONNECTION_ERRORS
 from .manager import SocketsManager, Websocket
 
 logger = logging.getLogger("openapi.ws")
@@ -66,8 +66,8 @@ async def get(self):
             async for msg in response:
                 if msg.type == web.WSMsgType.TEXT:
                     await self.on_message(msg)
-        except (asyncio.CancelledError, asyncio.TimeoutError, RuntimeError):
-            pass
+        except CONNECTION_ERRORS:
+            logger.info("lost connection with websocket %s", self)
         finally:
             self.sockets.remove(self)
         return response

openapi/ws/pubsub.py

@@ -5,7 +5,7 @@
 from ..data.validate import ValidationErrors
 from ..utils import cached_property
 from .channel import logger
-from .errors import CannotPublish, ChannelCallbackError
+from .errors import CONNECTION_ERRORS, CannotPublish, ChannelCallbackError
 from .rpc import ws_rpc
 
 if TYPE_CHECKING:  # pragma: no cover
@@ -44,7 +44,7 @@ async def __call__(self, channel: str, match: str, data: Any) -> None:
             if hasattr(data, "__call__"):
                 data = data()
             await self.ws.write(dict(channel=channel, event=match, data=data))
-        except RuntimeError:
+        except CONNECTION_ERRORS:
             logger.info("lost connection with %s", self)
             await self.ws.close()
             raise ChannelCallbackError