Merge branch 'main' into jacky-deadlock-patch

Author: jackyzha0

src/replit_river/server_session.py

@@ -145,9 +145,6 @@ async def _handle_messages_from_ws(self, tg: asyncio.TaskGroup) -> None:
                             )
                         await add_msg_to_stream(msg, stream)
                     else:
-                        # TODO(dstewart) This looks like it opens a new call to handler
-                        #                on ever ws message, instead of demuxing and
-                        #                routing.
                         _stream = await self._open_stream_and_call_handler(msg, tg)
                         if not stream:
                             async with self._stream_lock:

src/replit_river/server_transport.py

@@ -303,15 +303,7 @@ async def _establish_handshake(
             )
             raise SessionStateMismatchException(message)
 
-        # from this point on, we're committed to connecting
-        session_id = handshake_request.sessionId
-        handshake_response = await self._send_handshake_response(
-            request_message,
-            HandShakeStatus(ok=True, sessionId=session_id),
-            websocket,
-        )
-
-        return handshake_request, handshake_response
+            return handshake_request, handshake_response
 
     async def _delete_session(self, session: Session) -> None:
         async with self._session_lock: