dimples 1.5.2__tar.gz → 1.5.5__tar.gz

{dimples-1.5.2 → dimples-1.5.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dimples
-Version: 1.5.2
+Version: 1.5.5
 Summary: DIMP Library for Edges and Stations
 Home-page: https://github.com/dimchat/demo-py
 Author: Albert Moky

{dimples-1.5.2 → dimples-1.5.5}/dimples/client/messenger.py

@@ -40,9 +40,11 @@ from dimsdk import ContentType, Command
 from dimsdk import ReceiptCommand
 from dimsdk import MessageUtils
 
+from ..utils import get_msg_sig
 from ..common import HandshakeCommand, ReportCommand, LoginCommand
 from ..common import CommonMessenger
 
+from .checkpoint import Checkpoint
 from .network import ClientSession
 
 
@@ -54,6 +56,21 @@ class ClientMessenger(CommonMessenger):
         assert isinstance(sess, ClientSession), 'session error: %s' % sess
         return sess
 
+    # Override
+    async def deserialize_message(self, data: bytes) -> Optional[ReliableMessage]:
+        msg = await super().deserialize_message(data=data)
+        if msg is not None and self._check_message_duplicated(msg=msg):
+            msg = None
+        return msg
+
+    def _check_message_duplicated(self, msg: ReliableMessage) -> bool:
+        """ check duplicated """
+        cp = Checkpoint()
+        if cp.duplicated(msg=msg):
+            sig = get_msg_sig(msg=msg)
+            self.warning(msg='drop duplicated message (%s): %s -> %s' % (sig, msg.sender, msg.receiver))
+            return True
+
     # Override
     async def process_reliable_message(self, msg: ReliableMessage) -> List[ReliableMessage]:
         # call super

{dimples-1.5.2 → dimples-1.5.5}/dimples/client/packer.py

@@ -33,12 +33,9 @@ from dimsdk import ID
 from dimsdk import ContentType, TextContent, FileContent
 from dimsdk import InstantMessage, SecureMessage, ReliableMessage
 
-from ..utils import get_msg_sig
 from ..common import CommonFacebook
 from ..common import CommonMessagePacker
 
-from .checkpoint import Checkpoint
-
 
 class ClientMessagePacker(CommonMessagePacker):
 
@@ -141,20 +138,6 @@ class ClientMessagePacker(CommonMessagePacker):
             return None
         return await super().verify_message(msg=msg)
 
-    # Override
-    async def deserialize_message(self, data: bytes) -> Optional[ReliableMessage]:
-        msg = await super().deserialize_message(data=data)
-        if msg is not None and self._message_duplicated(msg=msg):
-            msg = None
-        return msg
-
-    def _message_duplicated(self, msg: ReliableMessage) -> bool:
-        cp = Checkpoint()
-        if cp.duplicated(msg=msg):
-            sig = get_msg_sig(msg=msg)
-            self.warning(msg='drop duplicated message (%s): %s -> %s' % (sig, msg.sender, msg.receiver))
-            return True
-
     # Override
     async def decrypt_message(self, msg: SecureMessage) -> Optional[InstantMessage]:
         try:
@@ -199,7 +182,11 @@ class ClientMessagePacker(CommonMessagePacker):
         checker = facebook.checker
         # visa.key not updated?
         user = await facebook.current_user
+        if user is None:
+            self.error(msg='current user not found')
+            return False
         visa = await user.visa
+        assert visa is not None, 'user visa error: %s' % user
         return await checker.send_visa(visa=visa, receiver=receiver)
 
     # protected

{dimples-1.5.2 → dimples-1.5.5}/dimples/client/processor.py

@@ -39,18 +39,12 @@ from dimsdk import Facebook, Messenger
 from dimsdk import ContentProcessorCreator
 
 from ..common import HandshakeCommand
-from ..common import CommonFacebook, CommonMessenger
+from ..common import CommonMessenger
 from ..common import CommonMessageProcessor
 
 
 class ClientMessageProcessor(CommonMessageProcessor):
 
-    @property
-    def facebook(self) -> Optional[CommonFacebook]:
-        barrack = super().facebook
-        assert isinstance(barrack, CommonFacebook), 'facebook error: %s' % barrack
-        return barrack
-
     @property
     def messenger(self) -> Optional[CommonMessenger]:
         transceiver = super().messenger
@@ -74,7 +68,7 @@ class ClientMessageProcessor(CommonMessageProcessor):
         doc_updated = False
         mem_updated = False
         # check group document time
-        last_doc_time = r_msg.get_datetime(key='GDT', default=None)
+        last_doc_time = r_msg.get_datetime(key='GDT')
         if last_doc_time is not None:
             if last_doc_time.after(now):
                 # calibrate the clock
@@ -85,7 +79,7 @@ class ClientMessageProcessor(CommonMessageProcessor):
                 self.info(msg='checking for new bulletin: %s' % group)
                 await facebook.get_documents(identifier=group)
         # check group history time
-        last_his_time = r_msg.get_datetime(key='GHT', default=None)
+        last_his_time = r_msg.get_datetime(key='GHT')
         if last_his_time is not None:
             if last_his_time.after(now):
                 # calibrate the clock
@@ -112,13 +106,16 @@ class ClientMessageProcessor(CommonMessageProcessor):
         elif isinstance(responses[0], HandshakeCommand):
             # urgent command
             return responses
+        else:
+            facebook = self.facebook
+            messenger = self.messenger
+            assert facebook is not None and messenger is not None, 'twins not ready: %s, %s' % (facebook, messenger)
         sender = r_msg.sender
         receiver = r_msg.receiver
-        me = await self.facebook.select_local_user(receiver=receiver)
+        me = await facebook.select_local_user(receiver=receiver)
         if me is None:
             # assert False, 'receiver error: %s' % receiver
             return responses
-        messenger = self.messenger
         # check responses
         from_bots = sender.type == EntityType.STATION or sender.type == EntityType.BOT
         for res in responses:

{dimples-1.5.2 → dimples-1.5.5}/dimples/common/compat/compatible.py

@@ -172,7 +172,7 @@ class CompatibleIncoming:
         #  get command name
         #
         cmd = content.get('command')
-        # cmd = Converter.get_str(value=cmd, default=None)
+        # cmd = Converter.get_str(value=cmd)
         if cmd is None or len(cmd) == 0:
             return
 
@@ -270,7 +270,7 @@ class CompatibleOutgoing:
     def _fix_type(cls, content: Dict[str, Any]):
         msg_type = content.get('type')
         if isinstance(msg_type, str):
-            num_type = Converter.get_int(value=msg_type, default=-1)
+            num_type = Converter.get_int(value=msg_type)
             if num_type is not None and num_type >= 0:
                 content['type'] = num_type
 

{dimples-1.5.2 → dimples-1.5.5}/dimples/common/compat/compressor.py

@@ -33,9 +33,8 @@ from .compatible import CompatibleIncoming
 
 class CompatibleCompressor(MessageCompressor):
 
-    # Override
-    def _create_shortener(self) -> MessageShortener:
-        return CompatibleShortener()
+    def __init__(self):
+        super().__init__(shortener=CompatibleShortener())
 
     # Override
     def compress_content(self, content: Dict, key: Dict) -> bytes:

{dimples-1.5.2 → dimples-1.5.5}/dimples/common/compat/loader.py

@@ -132,29 +132,25 @@ class _SafeConverter(BaseConverter):
         try:
             return super().get_bool(value=value, default=default)
         except ValueError:
-            # return default
-            pass
+            return default
 
     # Override
     def get_int(self, value: Any, default: Optional[int]) -> Optional[int]:
         try:
             return super().get_int(value=value, default=default)
         except ValueError:
-            # return default
-            pass
+            return default
 
     # Override
     def get_float(self, value: Any, default: Optional[float]) -> Optional[float]:
         try:
             return super().get_float(value=value, default=default)
         except ValueError:
-            # return default
-            pass
+            return default
 
     # Override
     def get_datetime(self, value: Any, default: Optional[DateTime]) -> Optional[DateTime]:
         try:
             return super().get_datetime(value=value, default=default)
         except ValueError:
-            # return default
-            pass
+            return default

{dimples-1.5.2 → dimples-1.5.5}/dimples/common/messenger.py

@@ -56,6 +56,7 @@ from .session import Transmitter, Session
 
 from .compat import CompatibleOutgoing
 from .compat import CompatibleCompressor
+from .compat import Compatible
 
 
 class CommonMessenger(Messenger, Transmitter, Logging, ABC):
@@ -105,6 +106,28 @@ class CommonMessenger(Messenger, Transmitter, Logging, ABC):
     def session(self) -> Session:
         return self.__session
 
+    # Override
+    async def serialize_message(self, msg: ReliableMessage) -> bytes:
+        Compatible.fix_meta_attachment(msg=msg)
+        Compatible.fix_visa_attachment(msg=msg)
+        return await super().serialize_message(msg=msg)
+
+    # Override
+    async def deserialize_message(self, data: bytes) -> Optional[ReliableMessage]:
+        if data is None or len(data) <= 4:
+            # message data error
+            return None
+        # elif not (data.startswith(b'{') and data.endswith(b'}')):
+        #     # only support JsON format now
+        #     return None
+        msg = await super().deserialize_message(data=data)
+        if msg is not None:
+            Compatible.fix_meta_attachment(msg=msg)
+            Compatible.fix_visa_attachment(msg=msg)
+        return msg
+
+    # -------- InstantMessageDelegate
+
     # Override
     async def encrypt_key(self, data: bytes, receiver: ID, msg: InstantMessage) -> Optional[bytes]:
         try:
@@ -129,7 +152,7 @@ class CommonMessenger(Messenger, Transmitter, Logging, ABC):
         # 2. serialize key without flags
         data = await super().serialize_key(key=key, msg=msg)
         # 3. put them back after serialized
-        if Converter.get_bool(value=reused, default=False):
+        if Converter.get_bool(value=reused):
             key['reused'] = reused
         if digest is not None:
             key['digest'] = digest

{dimples-1.5.2 → dimples-1.5.5}/dimples/common/packer.py

@@ -31,13 +31,11 @@ from dimsdk import ID
 from dimsdk import InstantMessage, SecureMessage, ReliableMessage
 from dimsdk import MessagePacker
 from dimsdk import MessageUtils
-from dimsdk import Compressor
 
 from ..utils import Logging
 
 from .facebook import CommonFacebook
 from .messenger import CommonMessenger
-from .compat import Compatible
 
 from .queue import SuspendedMessageQueue
 
@@ -54,10 +52,6 @@ class CommonMessagePacker(MessagePacker, Logging, ABC):
         assert isinstance(transceiver, CommonMessenger), 'transceiver error: %s' % transceiver
         return transceiver
 
-    @property  # Override
-    def compressor(self) -> Compressor:
-        return self.messenger.compressor
-
     def suspend_reliable_message(self, msg: ReliableMessage, error: Dict):
         self.__queue.suspend_reliable_message(msg=msg, error=error)
 
@@ -163,23 +157,3 @@ class CommonMessagePacker(MessagePacker, Logging, ABC):
             # already signed
             return msg
         return await super().sign_message(msg=msg)
-
-    # Override
-    async def deserialize_message(self, data: bytes) -> Optional[ReliableMessage]:
-        if data is None or len(data) <= 4:
-            # message data error
-            return None
-        # elif not (data.startswith(b'{') and data.endswith(b'}')):
-        #     # only support JsON format now
-        #     return None
-        msg = await super().deserialize_message(data=data)
-        if msg is not None:
-            Compatible.fix_meta_attachment(msg=msg)
-            Compatible.fix_visa_attachment(msg=msg)
-        return msg
-
-    # Override
-    async def serialize_message(self, msg: ReliableMessage) -> bytes:
-        Compatible.fix_meta_attachment(msg=msg)
-        Compatible.fix_visa_attachment(msg=msg)
-        return await super().serialize_message(msg=msg)

{dimples-1.5.2 → dimples-1.5.5}/dimples/common/processer.py

@@ -61,7 +61,7 @@ class CommonMessageProcessor(MessageProcessor, Logging, ABC):
             assert False, 'entity checker lost'
         doc_updated = False
         # check sender document time
-        last_doc_time = r_msg.get_datetime(key='SDT', default=None)
+        last_doc_time = r_msg.get_datetime(key='SDT')
         if last_doc_time is not None:
             now = DateTime.now()
             if last_doc_time.after(now):

{dimples-1.5.2 → dimples-1.5.5}/dimples/common/protocol/handshake.py

@@ -85,7 +85,7 @@ class HandshakeCommand(BaseCommand):
     @property
     def title(self) -> str:
         # TODO: modify after all clients upgraded
-        text = self.get_str(key='title', default=None)
+        text = self.get_str(key='title')
         if text is None:
             # compatible with v1.0
             text = self.get_str(key='message', default='')
@@ -93,7 +93,7 @@ class HandshakeCommand(BaseCommand):
 
     @property
     def session(self) -> Optional[str]:
-        return self.get_str(key='session', default=None)
+        return self.get_str(key='session')
 
     @property
     def state(self) -> HandshakeState:

{dimples-1.5.2 → dimples-1.5.5}/dimples/common/protocol/login.py

@@ -92,7 +92,7 @@ class LoginCommand(BaseCommand):
     # Device ID
     @property
     def device(self) -> Optional[str]:
-        return self.get_str(key='device', default=None)
+        return self.get_str(key='device')
 
     @device.setter
     def device(self, value: str):
@@ -104,7 +104,7 @@ class LoginCommand(BaseCommand):
     # User Agent
     @property
     def agent(self) -> Optional[str]:
-        return self.get_str(key='agent', default=None)
+        return self.get_str(key='agent')
 
     @agent.setter
     def agent(self, value: str):

{dimples-1.5.2 → dimples-1.5.5}/dimples/server/trace.py

@@ -48,7 +48,7 @@ class TraceNode(Dictionary):
 
     @property
     def time(self) -> float:
-        return self.get_float(key='time', default=0)
+        return self.get_float(key='time', default=0.0)
 
     def __eq__(self, other) -> bool:
         """ Return self == other. """

{dimples-1.5.2 → dimples-1.5.5}/dimples.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dimples
-Version: 1.5.2
+Version: 1.5.5
 Summary: DIMP Library for Edges and Stations
 Home-page: https://github.com/dimchat/demo-py
 Author: Albert Moky

{dimples-1.5.2 → dimples-1.5.5}/dimples.egg-info/requires.txt

@@ -1,6 +1,6 @@
 requests
-dimplugins>=2.3.1
-dimsdk>=2.3.1
+dimplugins>=2.3.2
+dimsdk>=2.3.2
 startrek>=2.2.2
 tcp>=2.2.2
 udp>=2.2.2

{dimples-1.5.2 → dimples-1.5.5}/setup.py

@@ -14,7 +14,7 @@ import io
 
 from setuptools import setup, find_packages
 
-__version__ = '1.5.2'
+__version__ = '1.5.5'
 __author__ = 'Albert Moky'
 __contact__ = 'albert.moky@gmail.com'
 
@@ -53,12 +53,12 @@ setup(
         # 'pycryptodome',  # 3.14.1
         # 'base58',  # 1.0.3
         # 'ecdsa',   # 0.16.1
-        'dimplugins>=2.3.1',
+        'dimplugins>=2.3.2',
 
-        'dimsdk>=2.3.1',
-        # 'dimp>=2.3.1',
-        # 'dkd>=2.3.1',
-        # 'mkm>=2.3.1',
+        'dimsdk>=2.3.2',
+        # 'dimp>=2.3.2',
+        # 'dkd>=2.3.2',
+        # 'mkm>=2.3.2',
 
         'startrek>=2.2.2',
         'tcp>=2.2.2',