dimples 0.5.2__tar.gz → 0.5.3__tar.gz

{dimples-0.5.2 → dimples-0.5.3}/PKG-INFO

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

{dimples-0.5.2 → dimples-0.5.3}/dimples/common/messenger.py

@@ -41,7 +41,7 @@ from typing import Optional, Union, Tuple
 from dimsdk import SymmetricKey
 from dimsdk import ID
 from dimsdk import Content, Envelope
-from dimsdk import Command
+from dimsdk import Command, DocumentCommand
 from dimsdk import InstantMessage, SecureMessage, ReliableMessage
 from dimsdk import EntityDelegate, CipherKeyDelegate
 from dimsdk import Messenger, Packer, Processor
@@ -170,9 +170,9 @@ class CommonMessenger(Messenger, Transmitter, Logging, ABC):
 
     # private
     def _attach_visa_time(self, sender: ID, msg: InstantMessage) -> bool:
-        if isinstance(msg.content, Command):
+        if isinstance(msg.content, DocumentCommand):
             # no need to attach times for command
-            return False
+            return True
         doc = self.facebook.visa(identifier=sender)
         if doc is None:
             self.error(msg='failed to get visa document for sender: %s' % sender)
@@ -200,8 +200,8 @@ class CommonMessenger(Messenger, Transmitter, Logging, ABC):
             # attach sender's document times
             # for the receiver to check whether user info synchronized
             ok = self._attach_visa_time(sender=sender, msg=msg)
-            assert ok or isinstance(msg.content, Command), \
-                'failed to attach document time: %s => %s' % (sender, msg.content)
+            if not ok:
+                self.warning(msg='failed to attach document time: %s => %s' % (sender, msg.content))
         #
         #  1. encrypt message
         #

{dimples-0.5.2 → dimples-0.5.3}/dimples/group/emitter.py

@@ -97,7 +97,7 @@ class GroupEmitter(Logging):
     def _attach_group_times(self, group: ID, msg: InstantMessage) -> bool:
         if isinstance(msg.content, GroupCommand):
             # no need to attach times for group command
-            return False
+            return True
         facebook = self.facebook
         doc = facebook.bulletin(identifier=group)
         if doc is None:
@@ -130,7 +130,8 @@ class GroupEmitter(Logging):
         # attach group document & history times
         # for the receiver to check whether group info synchronized
         ok = self._attach_group_times(group=group, msg=msg)
-        assert ok or isinstance(msg.content, GroupCommand), 'failed to attach group times: %s => %s' % (group, content)
+        if not ok:
+            self.warning(msg='failed to attach group times: %s => %s' % (group, content))
         # TODO: if it's a file message
         #       please upload the file data first
         #       before calling this

{dimples-0.5.2 → dimples-0.5.3}/dimples/server/packer.py

@@ -76,23 +76,29 @@ class ServerMessagePacker(CommonMessagePacker):
             # TODO: trusted station list
             return True
 
+    # Override
+    def deserialize_message(self, data: bytes) -> Optional[ReliableMessage]:
+        msg = super().deserialize_message(data=data)
+        if msg is not None:
+            sender = msg.sender
+            receiver = msg.receiver
+            # check duplicated
+            if self.__is_traced(msg=msg):
+                # cycled message
+                if sender.type == EntityType.STATION or receiver.type == EntityType.STATION:
+                    # ignore cycled station message
+                    self.warning(msg='drop cycled station message: %s -> %s' % (sender, receiver))
+                    return None
+                elif receiver.is_broadcast:
+                    # ignore cycled broadcast message
+                    self.warning(msg='drop cycled broadcast message: %s -> %s' % (sender, receiver))
+                    return None
+                self.warning(msg='cycled message: %s -> %s' % (sender, receiver))
+        return msg
+
     # Override
     def verify_message(self, msg: ReliableMessage) -> Optional[SecureMessage]:
-        sender = msg.sender
-        receiver = msg.receiver
-        # check duplicated
-        if self.__is_traced(msg=msg):
-            # cycled message
-            if sender.type == EntityType.STATION or receiver.type == EntityType.STATION:
-                # ignore cycled station message
-                self.warning(msg='cycled station message: %s -> %s' % (sender, receiver))
-                return None
-            elif receiver.is_broadcast:
-                # ignore cycled broadcast message
-                self.warning(msg='cycled broadcast message: %s -> %s' % (sender, receiver))
-                return None
-            self.warning(msg='cycled message: %s -> %s' % (sender, receiver))
-        # check session
+        # check session ready
         if self.__is_trusted(sender=msg.sender):
             # no need to verify message from this sender
             self.debug(msg='trusted sender: %s' % msg.sender)

{dimples-0.5.2 → dimples-0.5.3}/dimples/server/processor.py

@@ -41,7 +41,6 @@ from dimsdk import ContentProcessor, ContentProcessorCreator
 
 from dimsdk.cpu import BaseContentProcessor, BaseContentProcessorCreator
 
-from ..utils import get_msg_info
 from ..common import HandshakeCommand, LoginCommand
 from ..common import ReportCommand, AnsCommand
 from ..common import CommonFacebook, CommonMessenger
@@ -165,9 +164,6 @@ class ServerMessageProcessor(CommonMessageProcessor):
         # TODO: override to deliver to the receiver when catch exception "receiver error ..."
 
     def _force_handshake(self, msg: ReliableMessage) -> List[ReliableMessage]:
-        if self.messenger.verify_message(msg=msg) is None:
-            assert False, 'failed to verify message: %s' % get_msg_info(msg=msg)
-            # return []
         session = self.messenger.session
         sess_id = session.identifier
         current = self.facebook.current_user

{dimples-0.5.2 → dimples-0.5.3}/dimples.egg-info/PKG-INFO

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

{dimples-0.5.2 → dimples-0.5.3}/setup.py

@@ -14,7 +14,7 @@ import io
 
 from setuptools import setup, find_packages
 
-__version__ = '0.5.2'
+__version__ = '0.5.3'
 __author__ = 'Albert Moky'
 __contact__ = 'albert.moky@gmail.com'