dimples 1.3.2__tar.gz → 1.3.4__tar.gz

{dimples-1.3.2 → dimples-1.3.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dimples
-Version: 1.3.2
+Version: 1.3.4
 Summary: DIMP Library for Edges and Stations
 Home-page: https://github.com/dimchat/demo-py
 Author: Albert Moky
@@ -30,16 +30,16 @@ Description: # DIMP Library for Edges and Stations (Python version)
                 # 'pycryptodome',  # 3.14.1
                 # 'base58',  # 1.0.3
                 # 'ecdsa',   # 0.16.1
-                'dimplugins>=2.2.1',
+                'dimplugins>=2.2.2',
         
-                'dimsdk>=2.2.1',
-                # 'dimp>=2.2.1',
-                # 'dkd>=2.2.1',
-                # 'mkm>=2.2.1',
+                'dimsdk>=2.2.2',
+                # 'dimp>=2.2.2',
+                # 'dkd>=2.2.2',
+                # 'mkm>=2.2.2',
         
-                'startrek>=2.2.1',
-                'tcp>=2.2.1',
-                'udp>=2.2.1',
+                'startrek>=2.2.2',
+                'tcp>=2.2.2',
+                'udp>=2.2.2',
         
                 'aiou>=0.3.0',
             ]

{dimples-1.3.2 → dimples-1.3.4}/README.md

@@ -22,16 +22,16 @@
         # 'pycryptodome',  # 3.14.1
         # 'base58',  # 1.0.3
         # 'ecdsa',   # 0.16.1
-        'dimplugins>=2.2.1',
+        'dimplugins>=2.2.2',
 
-        'dimsdk>=2.2.1',
-        # 'dimp>=2.2.1',
-        # 'dkd>=2.2.1',
-        # 'mkm>=2.2.1',
+        'dimsdk>=2.2.2',
+        # 'dimp>=2.2.2',
+        # 'dkd>=2.2.2',
+        # 'mkm>=2.2.2',
 
-        'startrek>=2.2.1',
-        'tcp>=2.2.1',
-        'udp>=2.2.1',
+        'startrek>=2.2.2',
+        'tcp>=2.2.2',
+        'udp>=2.2.2',
 
         'aiou>=0.3.0',
     ]

{dimples-1.3.2 → dimples-1.3.4}/dimples/common/compat/__init__.py

@@ -41,10 +41,7 @@ from .meta import CompatibleMetaFactory
 from .loader import CommonLoader
 from .loader import CommonPluginLoader
 
-from .compatible import fix_meta_attachment, fix_meta_version
-from .compatible import fix_file_content
-from .compatible import fix_cmd, fix_command
-from .compatible import fix_receipt_command, fix_document_command, fix_report_command
+from .compatible import Compatible
 
 
 __all__ = [
@@ -62,9 +59,6 @@ __all__ = [
     'CommonLoader',
     'CommonPluginLoader',
 
-    'fix_meta_version', 'fix_meta_attachment',
-    'fix_file_content',
-    'fix_cmd', 'fix_command',
-    'fix_receipt_command', 'fix_document_command', 'fix_report_command',
+    'Compatible',
 
 ]

{dimples-1.3.2 → dimples-1.3.4}/dimples/common/compat/compatible.py

@@ -41,15 +41,32 @@ from ..protocol import MetaType
 #
 #  Compatible with old versions
 #
+class Compatible:
 
+    @classmethod
+    def fix_meta_attachment(cls, msg: ReliableMessage):
+        return _fix_meta_attachment(msg=msg)
 
-def fix_meta_attachment(msg: ReliableMessage):
+    @classmethod
+    def fix_meta_version(cls, meta: dict):
+        return _fix_meta_version(meta=meta)
+
+    @classmethod
+    def fix_file_content(cls, content: FileContent):
+        return _fix_file_content(content=content)
+
+    @classmethod
+    def fix_command(cls, content: Command) -> Command:
+        return _fix_command(content=content)
+
+
+def _fix_meta_attachment(msg: ReliableMessage):
     meta = msg.get('meta')
     if meta is not None:
-        fix_meta_version(meta=meta)
+        return _fix_meta_version(meta=meta)
 
 
-def fix_meta_version(meta: dict):
+def _fix_meta_version(meta: dict):
     version = meta.get('type')
     if version is None:
         version = meta.get('version')  # compatible with MKM 0.9.*
@@ -65,7 +82,7 @@ def fix_meta_version(meta: dict):
     return meta
 
 
-def fix_file_content(content: FileContent):
+def _fix_file_content(content: FileContent):
     pwd = content.get('key')
     if pwd is not None:
         # Tarsier version > 1.3.7
@@ -80,21 +97,29 @@ def fix_file_content(content: FileContent):
     return content
 
 
-def fix_command(content: Command) -> Command:
+def _fix_command(content: Command) -> Command:
     # 1. fix 'cmd'
-    content = fix_cmd(content=content)
+    content = _fix_cmd(content=content)
     # 2. fix other commands
     if isinstance(content, ReceiptCommand):
-        fix_receipt_command(content=content)
+        # receipt
+        _fix_receipt_command(content=content)
+    elif isinstance(content, ReportCommand):
+        # report
+        _fix_report_command(content=content)
+    elif isinstance(content, DocumentCommand):
+        # document
+        _fix_document_command(content=content)
     elif isinstance(content, MetaCommand):
+        # meta
         meta = content.get('meta')
         if meta is not None:
-            fix_meta_version(meta=meta)
+            _fix_meta_version(meta=meta)
     # OK
     return content
 
 
-def fix_cmd(content: Command):
+def _fix_cmd(content: Command):
     cmd = content.get('cmd')
     if cmd is None:
         cmd = content.get('command')
@@ -105,7 +130,7 @@ def fix_cmd(content: Command):
     return content
 
 
-def copy_receipt_values(content: ReceiptCommand, env: dict):
+def _copy_receipt_values(content: ReceiptCommand, env: dict):
     for key in ['sender', 'receiver', 'sn', 'signature']:
         value = env.get(key)
         if value is not None:
@@ -113,14 +138,14 @@ def copy_receipt_values(content: ReceiptCommand, env: dict):
 
 
 # TODO: remove after all server/client upgraded
-def fix_receipt_command(content: ReceiptCommand):
+def _fix_receipt_command(content: ReceiptCommand):
     origin = content.get('origin')
     if origin is not None:
         # (v2.0)
         # compatible with v1.0
         content['envelope'] = origin
         # compatible with older version
-        copy_receipt_values(content=content, env=origin)
+        _copy_receipt_values(content=content, env=origin)
         return content
     # check for old version
     env = content.get('envelope')
@@ -129,7 +154,7 @@ def fix_receipt_command(content: ReceiptCommand):
         # compatible with v2.0
         content['origin'] = env
         # compatible with older version
-        copy_receipt_values(content=content, env=env)
+        _copy_receipt_values(content=content, env=env)
         return content
     # check for older version
     if 'sender' in content:  # and 'receiver' in content:
@@ -147,7 +172,7 @@ def fix_receipt_command(content: ReceiptCommand):
 
 
 # TODO: remove after all server/client upgraded
-def fix_document_command(content: DocumentCommand):
+def _fix_document_command(content: DocumentCommand):
     info = content.get('document')
     if info is not None:
         # (v2.0)
@@ -186,7 +211,7 @@ def fix_document_command(content: DocumentCommand):
     return content
 
 
-def fix_report_command(content: ReportCommand):
+def _fix_report_command(content: ReportCommand):
     # check state for oldest version
     state = content.get('state')
     if state == 'background':

{dimples-1.3.2 → dimples-1.3.4}/dimples/common/messenger.py

@@ -53,7 +53,7 @@ from .dbi import MessageDBI
 from .facebook import CommonFacebook
 from .session import Transmitter, Session
 
-from .compat import fix_command, fix_file_content
+from .compat import Compatible
 
 
 class CommonMessenger(Messenger, Transmitter, Logging, ABC):
@@ -136,18 +136,18 @@ class CommonMessenger(Messenger, Transmitter, Logging, ABC):
     # Override
     async def serialize_content(self, content: Content, key: SymmetricKey, msg: InstantMessage) -> bytes:
         if isinstance(content, Command):
-            content = fix_command(content=content)
+            content = Compatible.fix_command(content=content)
         elif isinstance(content, FileContent):
-            content = fix_file_content(content=content)
+            content = Compatible.fix_file_content(content=content)
         return await super().serialize_content(content=content, key=key, msg=msg)
 
     # Override
     async def deserialize_content(self, data: bytes, key: SymmetricKey, msg: SecureMessage) -> Optional[Content]:
         content = await super().deserialize_content(data=data, key=key, msg=msg)
         if isinstance(content, Command):
-            content = fix_command(content=content)
+            content = Compatible.fix_command(content=content)
         elif isinstance(content, FileContent):
-            content = fix_file_content(content=content)
+            content = Compatible.fix_file_content(content=content)
         return content
 
     #

{dimples-1.3.2 → dimples-1.3.4}/dimples/common/packer.py

@@ -28,16 +28,13 @@ from typing import Optional, Dict
 
 from dimsdk import EncryptKey
 from dimsdk import ID
-from dimsdk import ReceiptCommand, DocumentCommand
 from dimsdk import InstantMessage, SecureMessage, ReliableMessage
 from dimsdk import MessagePacker
 from dimsdk import MessageUtils
 
 from ..utils import Logging
 
-from .compat import fix_meta_attachment
-from .compat import fix_receipt_command
-from .compat import fix_document_command
+from .compat import Compatible
 
 
 class CommonMessagePacker(MessagePacker, Logging, ABC):
@@ -135,25 +132,8 @@ class CommonMessagePacker(MessagePacker, Logging, ABC):
         else:
             self.warning(msg='receiver not ready: %s' % msg.receiver)
             return None
-        content = msg.content
-        if isinstance(content, ReceiptCommand):
-            # compatible with v1.0
-            fix_receipt_command(content=content)
         return await super().encrypt_message(msg=msg)
 
-    # Override
-    async def decrypt_message(self, msg: SecureMessage) -> Optional[InstantMessage]:
-        i_msg = await super().decrypt_message(msg=msg)
-        if i_msg is not None:
-            content = i_msg.content
-            if isinstance(content, ReceiptCommand):
-                # compatible with v1.0
-                fix_receipt_command(content=content)
-            elif isinstance(content, DocumentCommand):
-                # compatible with v1.0
-                fix_document_command(content=content)
-        return i_msg
-
     # Override
     async def verify_message(self, msg: ReliableMessage) -> Optional[SecureMessage]:
         # 1. check receiver/group with local user
@@ -183,10 +163,10 @@ class CommonMessagePacker(MessagePacker, Logging, ABC):
         #     return None
         msg = await super().deserialize_message(data=data)
         if msg is not None:
-            fix_meta_attachment(msg=msg)
+            Compatible.fix_meta_attachment(msg=msg)
         return msg
 
     # Override
     async def serialize_message(self, msg: ReliableMessage) -> bytes:
-        fix_meta_attachment(msg=msg)
+        Compatible.fix_meta_attachment(msg=msg)
         return await super().serialize_message(msg=msg)

{dimples-1.3.2 → dimples-1.3.4}/dimples/conn/protocol/ws.py

@@ -172,7 +172,7 @@ class WebSocket:
                 mask = None
             # 4. get payload
             if stream_len < pos + msg_len:
-                Log.info(msg='incomplete ws package for payload: %d, msg len: %d' % (stream_len, msg_len))
+                # Log.info(msg='incomplete ws package for payload: %d, msg len: %d' % (stream_len, msg_len))
                 return None, stream
             payload = stream[pos:pos+msg_len]
             pos += msg_len
@@ -212,7 +212,7 @@ class WebSocket:
                 # cut the received package(s) and return the remaining
                 stream = stream[pos:]
                 break
-        Log.info(msg='received ws payload len: %d, left: %d' % (len(data), len(stream)))
+        # Log.info(msg='received ws payload len: %d, left: %d' % (len(data), len(stream)))
         return data, stream
 
     @classmethod

{dimples-1.3.2 → dimples-1.3.4}/dimples/database/dos/meta.py

@@ -28,12 +28,14 @@ from typing import Optional
 from dimsdk import ID, Meta
 
 from ...utils import template_replace
+from ...utils import Logging
+from ...common.compat import Compatible
 from ...common import MetaDBI
 
 from .base import Storage
 
 
-class MetaStorage(Storage, MetaDBI):
+class MetaStorage(Storage, Logging, MetaDBI):
     """
         Meta for Entities (User/Group)
         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -69,5 +71,10 @@ class MetaStorage(Storage, MetaDBI):
         if info is None:
             # file not found
             self.warning(msg='meta file not found: %s' % path)
+            return None
         else:
+            Compatible.fix_meta_version(meta=info)
+        try:
             return Meta.parse(meta=info)
+        except Exception as error:
+            self.error(msg='meta error: %s, %s' % (error, info))

{dimples-1.3.2 → dimples-1.3.4}/dimples/database/redis/meta.py

@@ -28,11 +28,13 @@ from typing import Optional
 from dimsdk import ID, Meta
 
 from ...utils import json_encode, json_decode, utf8_encode, utf8_decode
+from ...utils import Logging
+from ...common.compat import Compatible
 
 from .base import Cache
 
 
-class MetaCache(Cache):
+class MetaCache(Cache, Logging):
 
     # meta cached in Redis will be removed after 10 hours, after that
     # it will be reloaded from local storage if it's still need.
@@ -58,12 +60,19 @@ class MetaCache(Cache):
     async def get_meta(self, identifier: ID) -> Optional[Meta]:
         key = self.__cache_name(identifier=identifier)
         value = await self.get(name=key)
-        if value is not None:
+        if value is None:
+            # cache not found
+            return None
+        else:
             js = utf8_decode(data=value)
             assert js is not None, 'failed to decode string: %s' % value
             info = json_decode(string=js)
             assert info is not None, 'meta error: %s' % value
+            Compatible.fix_meta_version(meta=info)
+        try:
             return Meta.parse(meta=info)
+        except Exception as error:
+            self.error(msg='meta error: %s, %s' % (error, info))
 
     async def save_meta(self, meta: Meta, identifier: ID) -> bool:
         dictionary = meta.dictionary

{dimples-1.3.2 → dimples-1.3.4}/dimples/group/manager.py

@@ -67,15 +67,15 @@ class GroupManager(TripletsHelper):
 
     def _create_packer(self) -> GroupPacker:
         """ override for customized packer """
-        return GroupPacker(self.__delegate)
+        return GroupPacker(self.delegate)
 
     def _create_helper(self) -> GroupCommandHelper:
         """ override for customized helper """
-        return GroupCommandHelper(self.__delegate)
+        return GroupCommandHelper(self.delegate)
 
     def _create_builder(self) -> GroupHistoryBuilder:
         """ override for customized builder """
-        return GroupHistoryBuilder(self.__delegate)
+        return GroupHistoryBuilder(self.delegate)
 
     async def create_group(self, members: List[ID]) -> Optional[ID]:
         """
@@ -232,7 +232,6 @@ class GroupManager(TripletsHelper):
         """
         Invite new members to this group
 
-
         :param members: inviting member list
         :param group:   group ID
         :return: False on error

{dimples-1.3.2 → dimples-1.3.4}/dimples/server/facebook.py

@@ -34,6 +34,7 @@ from typing import Optional, List
 
 from dimsdk import ID, User
 
+from ..common import BroadcastUtils
 from ..common import CommonFacebook
 
 
@@ -67,16 +68,31 @@ class ServerFacebook(CommonFacebook):
 
     # Override
     async def get_founder(self, identifier: ID) -> Optional[ID]:
+        assert identifier.is_group, 'group ID error: %s' % identifier
+        # check broadcast group
+        if identifier.is_broadcast:
+            # founder of broadcast group
+            return BroadcastUtils.broadcast_founder(group=identifier)
         self.error(msg='DO NOT CALL ME: %s' % identifier)
         return None
 
     # Override
     async def get_owner(self, identifier: ID) -> Optional[ID]:
+        assert identifier.is_group, 'group ID error: %s' % identifier
+        # check broadcast group
+        if identifier.is_broadcast:
+            # owner of broadcast group
+            return BroadcastUtils.broadcast_owner(group=identifier)
         self.error(msg='DO NOT CALL ME: %s' % identifier)
         return None
 
     # Override
     async def get_members(self, identifier: ID) -> List[ID]:
+        assert identifier.is_group, 'group ID error: %s' % identifier
+        # check broadcast group
+        if identifier.is_broadcast:
+            # members of broadcast group
+            return BroadcastUtils.broadcast_members(group=identifier)
         self.error(msg='DO NOT CALL ME: %s' % identifier)
         return []
 

{dimples-1.3.2 → dimples-1.3.4}/dimples/server/session.py

@@ -275,6 +275,6 @@ async def remove_reliable_message(msg: ReliableMessage, receiver: ID, database:
         #     return False
         receiver = msg.receiver
     info = get_msg_info(msg=msg)
-    Log.info(msg='message sent for %s, remove from db: %s' % (receiver, info))
+    Log.info(msg='message sent, remove it: %s' % info)
     # remove sent message from database
     return await database.remove_reliable_message(msg=msg, receiver=receiver)

{dimples-1.3.2 → dimples-1.3.4}/dimples/station/shared.py

@@ -131,6 +131,12 @@ class GlobalVariable:
         dispatcher.facebook = facebook
         dispatcher.deliver = deliver
         dispatcher.roamer = roamer
+        # this messenger is only for encryption, so don't need a session
+        messenger = create_messenger(facebook=facebook, database=mdb, session=None)
+        self.__messenger = messenger
+        checker = facebook.checker
+        assert isinstance(checker, ServerChecker), 'entity checker error: %s' % checker
+        checker.messenger = messenger
 
     async def login(self, current_user: ID):
         facebook = self.facebook

{dimples-1.3.2 → dimples-1.3.4}/dimples.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dimples
-Version: 1.3.2
+Version: 1.3.4
 Summary: DIMP Library for Edges and Stations
 Home-page: https://github.com/dimchat/demo-py
 Author: Albert Moky
@@ -30,16 +30,16 @@ Description: # DIMP Library for Edges and Stations (Python version)
                 # 'pycryptodome',  # 3.14.1
                 # 'base58',  # 1.0.3
                 # 'ecdsa',   # 0.16.1
-                'dimplugins>=2.2.1',
+                'dimplugins>=2.2.2',
         
-                'dimsdk>=2.2.1',
-                # 'dimp>=2.2.1',
-                # 'dkd>=2.2.1',
-                # 'mkm>=2.2.1',
+                'dimsdk>=2.2.2',
+                # 'dimp>=2.2.2',
+                # 'dkd>=2.2.2',
+                # 'mkm>=2.2.2',
         
-                'startrek>=2.2.1',
-                'tcp>=2.2.1',
-                'udp>=2.2.1',
+                'startrek>=2.2.2',
+                'tcp>=2.2.2',
+                'udp>=2.2.2',
         
                 'aiou>=0.3.0',
             ]

{dimples-1.3.2 → dimples-1.3.4}/dimples.egg-info/requires.txt

@@ -1,4 +1,4 @@
-dimplugins>=2.2.1
+dimplugins>=2.2.2
 dimsdk>=2.2.2
 startrek>=2.2.2
 tcp>=2.2.2

{dimples-1.3.2 → dimples-1.3.4}/setup.py

@@ -14,7 +14,7 @@ import io
 
 from setuptools import setup, find_packages
 
-__version__ = '1.3.2'
+__version__ = '1.3.4'
 __author__ = 'Albert Moky'
 __contact__ = 'albert.moky@gmail.com'
 
@@ -51,7 +51,7 @@ setup(
         # 'pycryptodome',  # 3.14.1
         # 'base58',  # 1.0.3
         # 'ecdsa',   # 0.16.1
-        'dimplugins>=2.2.1',
+        'dimplugins>=2.2.2',
 
         'dimsdk>=2.2.2',
         # 'dimp>=2.2.2',