fix session invalidation prevention on duplicate state events

Author: jkhsjdhjs

mautrix/client/client.py

@@ -28,7 +28,7 @@ def __init__(
     ) -> None:
         EncryptingAPI.__init__(self, *args, state_store=state_store, **kwargs)
         Syncer.__init__(self, sync_store)
-        self.add_event_handler(EventType.ALL, self._update_state)
+        self.add_event_handler(EventType.ALL, self._update_state, wait_sync=True)
 
     async def _update_state(self, evt: Event) -> None:
         if not isinstance(evt, StateEvent) or not self.state_store:

mautrix/client/syncer.py

@@ -250,7 +250,7 @@ def dispatch_manual_event(
         tasks = []
         for handler, wait_sync in handlers:
             if force_synchronous or wait_sync:
-                tasks.append(asyncio.create_task(self._catch_errors(handler, data)))
+                tasks.append(self._catch_errors(handler, data))
             else:
                 background_task.create(self._catch_errors(handler, data))
         return tasks
@@ -471,7 +471,8 @@ async def _start(self, filter_id: FilterID | None) -> None:
             start = time.monotonic()
             try:
                 tasks = self.handle_sync(data)
-                await asyncio.gather(*tasks)
+                for task in tasks:
+                    await task
             except Exception:
                 self.log.exception(f"Sync handling ({current_batch}) errored")
             else:

mautrix/crypto/machine.py

@@ -106,7 +106,7 @@ def __init__(
         # self.client.add_event_handler(EventType.ROOM_KEY_WITHHELD, self.handle_room_key_withheld)
         # self.client.add_event_handler(EventType.ORG_MATRIX_ROOM_KEY_WITHHELD,
         #                               self.handle_room_key_withheld)
-        self.client.add_event_handler(EventType.ROOM_MEMBER, self.handle_member_event)
+        self.client.add_event_handler(EventType.ROOM_MEMBER, self.handle_member_event, wait_sync=True)
 
     async def load(self) -> None:
         """Load the Olm account into memory, or create one if the store doesn't have one stored."""