Fix hidden DMs not reappearing live, and the recurring idle-transaction leak

Two related fixes:

1. A hidden DM's un-hide-on-new-message path only cleared
   RoomMembership.hidden_at in the DB -- it never told an already-open
   client to refresh. The only existing signal for that room
   (unread_update) does setRooms(prev => prev.map(...)), which is a
   no-op for a room that isn't in `prev` at all -- exactly what a
   hidden DM is. Now broadcasts the same room_added signal a brand new
   DM gets (via UPDATE ... RETURNING to know exactly who was
   un-hidden), reusing the fix already established for that class of
   bug.

2. While debugging #1's test, found the actual root cause behind the
   deploy-blocking migrations from earlier this session: every
   WebSocket connection shares one AsyncSession for its entire
   lifetime, and SQLAlchemy opens a transaction implicitly on first
   use. Nothing ever committed it -- not the initial auth lookup, not
   any of the several read-then-continue branches in the message loop
   (join/message/edit/reaction all check membership this way). A
   connection that's just sitting open (which for a real user can be
   hours) was holding that transaction open the entire time, which is
   exactly what blocked ALTER TABLE twice in production this session
   (confirmed both times via pg_stat_activity -- idle in transaction
   for 30+ minutes on this exact query shape). Now commits once after
   connection setup and once after every frame via a try/finally
   wrapping the whole dispatch, so no exit path (including the many
   `continue`s) can leave a transaction open while idling on the next
   receive_json().

Verified end-to-end in the browser (a hidden DM reappears in an
already-open tab with zero reload when the other person messages
again) and via a new WS-level test reproducing the exact scenario.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
2026-08-19 17:20:00 -06:00
co-authored by Claude Sonnet 5
parent 766883c992
commit 1d9fe25410
3 changed files with 212 additions and 144 deletions
+13 -2
View File
@@ -143,13 +143,24 @@ async def broadcast_new_message(
# A no-op for a regular room (hidden_at is only ever set on a DM's
# membership row -- see RoomMembership.hidden_at) -- new activity
# un-hiding a DM someone closed matches find_or_create_dm's own
# un-hide-on-reopen behavior.
await db.execute(
# un-hide-on-reopen behavior. `.returning` so we know exactly who was
# un-hidden -- their client needs the same room_added signal a brand
# new DM does (see broadcast_room_added's docstring): the room wasn't
# in their already-loaded room list at all, so unread_update's plain
# setRooms(prev => prev.map(...)) can't make it reappear -- there's
# nothing in `prev` for it to match.
unhidden_result = await db.execute(
update(RoomMembership)
.where(RoomMembership.room_id == room_id, RoomMembership.hidden_at.is_not(None))
.values(hidden_at=None)
.returning(RoomMembership.user_id)
)
unhidden_user_ids = list(unhidden_result.scalars().all())
await db.commit()
for unhidden_user_id in unhidden_user_ids:
await broadcaster.publish_to_user(
unhidden_user_id, {"type": "room_added", "room_id": str(room_id)}
)
await _notify_offline_members(db, broadcaster, presence, room_id, sender, message)
await dispatch_event(db, "message.created", room_id, payload)
_maybe_fetch_link_preview(broadcaster, room_id, message)
+27 -7
View File
@@ -89,10 +89,22 @@ async def chat_endpoint(websocket: WebSocket, db: AsyncSession = Depends(get_db)
# visible.
if await global_presence.connect(user.id):
await broadcast_member_updated(db, broadcaster, user.id)
# This session is shared for the connection's entire lifetime (which can
# be hours) -- SQLAlchemy opens a transaction implicitly on first use,
# and every read above (the auth lookup, broadcast_member_updated's own
# query) leaves it open with nothing to ever close it otherwise. Left
# uncommitted, that transaction sits "idle in transaction" holding locks
# for as long as the socket stays open -- confirmed in production
# blocking unrelated schema migrations on the same tables for 30+
# minutes. Committing here, and again after every frame below, means
# the connection is never sitting on an open transaction while merely
# waiting for the next one.
await db.commit()
try:
while True:
raw = await websocket.receive_json()
try:
try:
envelope = ClientEnvelope.model_validate(raw)
except ValidationError:
@@ -163,13 +175,14 @@ async def chat_endpoint(websocket: WebSocket, db: AsyncSession = Depends(get_db)
message = await create_message(
db, envelope.room_id, user.id, envelope.content, image_id, file_id
)
# Sending implies having seen the room as of now -- without
# this, GET /rooms/mine would show the sender's own room as
# unread the instant they send into it (last_read_at isn't
# otherwise bumped until the frontend's own message echo
# triggers a mark-read call, which is a real but avoidable
# race). Deliberately not done in create_message() itself:
# the incoming-webhook path also calls it, and a webhook's
# Sending implies having seen the room as of now --
# without this, GET /rooms/mine would show the sender's
# own room as unread the instant they send into it
# (last_read_at isn't otherwise bumped until the
# frontend's own message echo triggers a mark-read
# call, which is a real but avoidable race).
# Deliberately not done in create_message() itself: the
# incoming-webhook path also calls it, and a webhook's
# attributed sender may not actually be watching.
await mark_room_read(db, envelope.room_id, user.id)
await broadcast_new_message(db, broadcaster, presence, envelope.room_id, message, user)
@@ -240,6 +253,13 @@ async def chat_endpoint(websocket: WebSocket, db: AsyncSession = Depends(get_db)
await websocket.send_json(
{"type": "error", "detail": f"Unknown message type: {envelope.type}"}
)
finally:
# See the comment on the pre-loop commit above -- guarantees
# every single frame, on every exit path (including the
# many `continue`s above, which still run a `finally`
# before actually looping), leaves nothing open while this
# blocks on the next receive_json().
await db.commit()
except WebSocketDisconnect:
pass
+37
View File
@@ -168,6 +168,43 @@ def test_start_dm_notifies_other_participant_via_websocket(ws_client_factory):
assert received == {"type": "room_added", "room_id": room["id"]}
def test_new_message_notifies_recipient_who_hid_the_dm_via_websocket(ws_client_factory):
# A second production report on the same underlying gap: hiding a DM
# correctly clears out of GET /rooms/mine, but when the other person
# messages again, the *only* existing signal for that (unread_update)
# does `setRooms(prev => prev.map(...))` -- a no-op for a room that
# isn't in `prev` at all, which a hidden DM by definition isn't. Needs
# the same room_added signal a brand new DM gets, not just a DB-level
# un-hide.
instance1 = ws_client_factory()
instance2 = ws_client_factory()
alice = _register_ws(instance1, _unique("alice"))
bob = _register_ws(instance2, _unique("bob"))
room = instance1.post("/api/rooms/dm", json={"other_user_id": bob["id"]}).json()
resp = instance2.post(f"/api/rooms/{room['id']}/hide")
assert resp.status_code == 204
with instance2.websocket_connect("/ws/chat") as bob_ws:
with instance1.websocket_connect("/ws/chat") as alice_ws:
alice_ws.send_json({"type": "join", "room_id": room["id"]})
assert alice_ws.receive_json()["type"] == "joined"
alice_ws.send_json({"type": "message", "room_id": room["id"], "content": "you there?"})
alice_ws.receive_json()
# Sync barrier (see test_mentions.py's identical helper): the
# message ack only proves the room-level broadcast happened,
# not that broadcast_new_message's own continuation (which
# un-hides the room and publishes room_added) has finished --
# a second frame's own ack proves that before this connection
# closes underneath it.
alice_ws.send_json({"type": "join", "room_id": room["id"]})
assert alice_ws.receive_json()["type"] == "joined"
received = bob_ws.receive_json()
assert received == {"type": "room_added", "room_id": room["id"]}
def test_profile_update_notifies_room_members_via_websocket(ws_client_factory, monkeypatch):
# Only reaches clients that have the room's own channel joined --
# exactly the case where a stale avatar/display name would actually be