|
@@ -52,6 +52,11 @@ FEDERATION_TIMEOUT = 60 * 1000
|
|
|
FEDERATION_PING_INTERVAL = 40 * 1000
|
|
|
|
|
|
|
|
|
+# How long to remember a typing notification happened in a room before
|
|
|
+# forgetting about it.
|
|
|
+FORGET_TIMEOUT = 10 * 60 * 1000
|
|
|
+
|
|
|
+
|
|
|
class FollowerTypingHandler:
|
|
|
"""A typing handler on a different process than the writer that is updated
|
|
|
via replication.
|
|
@@ -83,7 +88,10 @@ class FollowerTypingHandler:
|
|
|
self.wheel_timer: WheelTimer[RoomMember] = WheelTimer(bucket_size=5000)
|
|
|
self._latest_room_serial = 0
|
|
|
|
|
|
+ self._rooms_updated: Set[str] = set()
|
|
|
+
|
|
|
self.clock.looping_call(self._handle_timeouts, 5000)
|
|
|
+ self.clock.looping_call(self._prune_old_typing, FORGET_TIMEOUT)
|
|
|
|
|
|
def _reset(self) -> None:
|
|
|
"""Reset the typing handler's data caches."""
|
|
@@ -92,6 +100,8 @@ class FollowerTypingHandler:
|
|
|
# map room IDs to sets of users currently typing
|
|
|
self._room_typing = {}
|
|
|
|
|
|
+ self._rooms_updated = set()
|
|
|
+
|
|
|
self._member_last_federation_poke = {}
|
|
|
self.wheel_timer = WheelTimer(bucket_size=5000)
|
|
|
|
|
@@ -178,6 +188,7 @@ class FollowerTypingHandler:
|
|
|
prev_typing = self._room_typing.get(row.room_id, set())
|
|
|
now_typing = set(row.user_ids)
|
|
|
self._room_typing[row.room_id] = now_typing
|
|
|
+ self._rooms_updated.add(row.room_id)
|
|
|
|
|
|
if self.federation:
|
|
|
run_as_background_process(
|
|
@@ -209,6 +220,19 @@ class FollowerTypingHandler:
|
|
|
def get_current_token(self) -> int:
|
|
|
return self._latest_room_serial
|
|
|
|
|
|
+ def _prune_old_typing(self) -> None:
|
|
|
+ """Prune rooms that haven't seen typing updates since last time.
|
|
|
+
|
|
|
+ This is safe to do as clients should time out old typing notifications.
|
|
|
+ """
|
|
|
+ stale_rooms = self._room_serials.keys() - self._rooms_updated
|
|
|
+
|
|
|
+ for room_id in stale_rooms:
|
|
|
+ self._room_serials.pop(room_id, None)
|
|
|
+ self._room_typing.pop(room_id, None)
|
|
|
+
|
|
|
+ self._rooms_updated = set()
|
|
|
+
|
|
|
|
|
|
class TypingWriterHandler(FollowerTypingHandler):
|
|
|
def __init__(self, hs: "HomeServer"):
|
|
@@ -388,6 +412,7 @@ class TypingWriterHandler(FollowerTypingHandler):
|
|
|
self._typing_stream_change_cache.entity_has_changed(
|
|
|
member.room_id, self._latest_room_serial
|
|
|
)
|
|
|
+ self._rooms_updated.add(member.room_id)
|
|
|
|
|
|
self.notifier.on_new_event(
|
|
|
StreamKeyType.TYPING, self._latest_room_serial, rooms=[member.room_id]
|