Add locks in cached async get methods. Might fix #48

mautrix_signal/portal.py

@@ -27,7 +27,7 @@ import os
 from mausignald.types import (Address, MessageData, Reaction, Quote, Group, Contact, Profile,
                               Attachment, GroupID, GroupV2ID, GroupV2, Mention, Sticker)
 from mautrix.appservice import AppService, IntentAPI
-from mautrix.bridge import BasePortal
+from mautrix.bridge import BasePortal, async_getter_lock
 from mautrix.types import (EventID, MessageEventContent, RoomID, EventType, MessageType,
                            MessageEvent, EncryptedEvent, ContentURI, MediaMessageEventContent,
                            ImageInfo, VideoInfo, FileInfo, AudioInfo)
@@ -929,6 +929,7 @@ class Portal(DBPortal, BasePortal):
                 yield portal
 
     @classmethod
+    @async_getter_lock
     async def get_by_mxid(cls, mxid: RoomID) -> Optional['Portal']:
         try:
             return cls.by_mxid[mxid]
@@ -943,7 +944,8 @@ class Portal(DBPortal, BasePortal):
         return None
 
     @classmethod
-    async def get_by_chat_id(cls, chat_id: Union[GroupID, Address], receiver: str = "",
+    @async_getter_lock
+    async def get_by_chat_id(cls, chat_id: Union[GroupID, Address], *, receiver: str = "",
                              create: bool = False) -> Optional['Portal']:
         if isinstance(chat_id, str):
             receiver = ""

mautrix_signal/puppet.py

@@ -23,7 +23,7 @@ import os.path
 from yarl import URL
 
 from mausignald.types import Address, Contact, Profile
-from mautrix.bridge import BasePuppet
+from mautrix.bridge import BasePuppet, async_getter_lock
 from mautrix.appservice import IntentAPI
 from mautrix.types import UserID, SyncToken, RoomID, ContentURI
 from mautrix.errors import MForbidden
@@ -286,6 +286,7 @@ class Puppet(DBPuppet, BasePuppet):
         return await cls.get_by_address(address, create)
 
     @classmethod
+    @async_getter_lock
     async def get_by_custom_mxid(cls, mxid: UserID) -> Optional['Puppet']:
         try:
             return cls.by_custom_mxid[mxid]
@@ -323,6 +324,7 @@ class Puppet(DBPuppet, BasePuppet):
         return UserID(cls.mxid_template.format_full(identifier))
 
     @classmethod
+    @async_getter_lock
     async def get_by_address(cls, address: Address, create: bool = True) -> Optional['Puppet']:
         puppet = await cls._get_by_address(address, create)
         if puppet and address.uuid and not puppet.uuid:

mautrix_signal/user.py

@@ -21,7 +21,7 @@ import os.path
 import shutil
 
 from mausignald.types import Account, Address, Contact, Group, GroupV2, ListenEvent, ListenAction
-from mautrix.bridge import BaseUser
+from mautrix.bridge import BaseUser, async_getter_lock
 from mautrix.types import UserID, RoomID
 from mautrix.appservice import AppService
 from mautrix.util.opt_prometheus import Gauge
@@ -148,7 +148,8 @@ class User(DBUser, BaseUser):
             profile = None
         await puppet.update_info(profile or contact)
         if create_portals:
-            portal = await po.Portal.get_by_chat_id(puppet.address, self.username, create=True)
+            portal = await po.Portal.get_by_chat_id(puppet.address, receiver=self.username,
+                                                    create=True)
             await portal.create_matrix_room(self, profile or contact)
 
     async def _sync_group(self, group: Group, create_portals: bool) -> None:
@@ -197,6 +198,7 @@ class User(DBUser, BaseUser):
             self.by_username[self.username] = self
 
     @classmethod
+    @async_getter_lock
     async def get_by_mxid(cls, mxid: UserID, create: bool = True) -> Optional['User']:
         # Never allow ghosts to be users
         if pu.Puppet.get_id_from_mxid(mxid):
@@ -220,6 +222,7 @@ class User(DBUser, BaseUser):
         return None
 
     @classmethod
+    @async_getter_lock
     async def get_by_username(cls, username: str) -> Optional['User']:
         try:
             return cls.by_username[username]

requirements.txt

@@ -4,5 +4,5 @@ commonmark>=0.8,<0.10
 aiohttp>=3,<4
 yarl>=1,<2
 attrs>=19.1
-mautrix>=0.8.11,<0.9
+mautrix>=0.8.13,<0.9
 asyncpg>=0.20,<0.22