Merge branch 'master' into fix/refactor-mplex-swarm-host

libp2p/network/connection/exceptions.py

@@ -0,0 +1,5 @@
+from libp2p.io.exceptions import IOException
+
+
+class RawConnError(IOException):
+    pass

libp2p/network/connection/raw_connection.py

@@ -1,5 +1,6 @@
 import asyncio
 
+from .exceptions import RawConnError
 from .raw_connection_interface import IRawConnection
 
 
@@ -23,19 +24,33 @@ class RawConnection(IRawConnection):
         self._drain_lock = asyncio.Lock()
 
     async def write(self, data: bytes) -> None:
-        self.writer.write(data)
+        """
+        Raise `RawConnError` if the underlying connection breaks
+        """
+        try:
+            self.writer.write(data)
+        except ConnectionResetError as error:
+            raise RawConnError(error)
         # Reference: https://github.com/ethereum/lahja/blob/93610b2eb46969ff1797e0748c7ac2595e130aef/lahja/asyncio/endpoint.py#L99-L102  # noqa: E501
         # Use a lock to serialize drain() calls. Circumvents this bug:
         # https://bugs.python.org/issue29930
         async with self._drain_lock:
-            await self.writer.drain()
+            try:
+                await self.writer.drain()
+            except ConnectionResetError:
+                raise RawConnError()
 
     async def read(self, n: int = -1) -> bytes:
         """
         Read up to ``n`` bytes from the underlying stream.
         This call is delegated directly to the underlying ``self.reader``.
+
+        Raise `RawConnError` if the underlying connection breaks
         """
-        return await self.reader.read(n)
+        try:
+            return await self.reader.read(n)
+        except ConnectionResetError as error:
+            raise RawConnError(error)
 
     async def close(self) -> None:
         self.writer.close()