Abort streams

Author: JimmyAustin

src/replit_river/client_session.py

@@ -99,17 +99,20 @@ async def serve(self) -> None:
             try:
                 await self._handle_messages_from_ws()
             except ConnectionClosed:
+                self._abort_all_streams()
                 if self._retry_connection_callback:
                     self._task_manager.create_task(self._retry_connection_callback())
 
                 await self._begin_close_session_countdown()
                 logger.debug("ConnectionClosed while serving", exc_info=True)
             except FailedSendingMessageException:
                 # Expected error if the connection is closed.
+                self._abort_all_streams()
                 logger.debug(
                     "FailedSendingMessageException while serving", exc_info=True
                 )
             except Exception:
+                self._abort_all_streams()
                 logger.exception("caught exception at message iterator")
         except ExceptionGroup as eg:
             _, unhandled = eg.split(lambda e: isinstance(e, ConnectionClosed))

src/replit_river/server_session.py

@@ -87,6 +87,7 @@ async def serve(self) -> None:
                 try:
                     await self._handle_messages_from_ws(tg)
                 except ConnectionClosed:
+                    self._abort_all_streams()
                     if self._retry_connection_callback:
                         self._task_manager.create_task(
                             self._retry_connection_callback()
@@ -96,10 +97,12 @@ async def serve(self) -> None:
                     logger.debug("ConnectionClosed while serving", exc_info=True)
                 except FailedSendingMessageException:
                     # Expected error if the connection is closed.
+                    self._abort_all_streams()
                     logger.debug(
                         "FailedSendingMessageException while serving", exc_info=True
                     )
                 except Exception:
+                    self._abort_all_streams()
                     logger.exception("caught exception at message iterator")
         except ExceptionGroup as eg:
             _, unhandled = eg.split(lambda e: isinstance(e, ConnectionClosed))

src/replit_river/session.py

@@ -286,6 +286,14 @@ async def close_websocket(
         if should_retry and self._retry_connection_callback:
             self._task_manager.create_task(self._retry_connection_callback())
 
+    def _abort_all_streams(self) -> None:
+        """Close all active stream channels, notifying any waiting consumers."""
+        if not self._streams:
+            return
+        for stream in self._streams.values():
+            stream.close()
+        self._streams.clear()
+
     async def close(self) -> None:
         """Close the session and all associated streams."""
         logger.info(
@@ -310,9 +318,7 @@ async def close(self) -> None:
 
             # TODO: unexpected_close should close stream differently here to
             # throw exception correctly.
-            for stream in self._streams.values():
-                stream.close()
-            self._streams.clear()
+            self._abort_all_streams()
 
             self._state = SessionState.CLOSED