dimples 0.5.1__tar.gz → 0.5.3__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dimples
-Version: 0.5.1
+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.1 → dimples-0.5.3}/dimples/__init__.py

@@ -333,7 +333,8 @@ __all__ = [
     'AddressNameServer', 'ANSFactory',
     'CommonArchivist',
     'CommonFacebook', 'CommonMessenger',
-    'CommonMessagePacker', 'Transmitter',
+    'CommonMessagePacker', 'CommonMessageProcessor',
+    'Transmitter',
     'Session',
 
     ####################################

{dimples-0.5.1 → dimples-0.5.3}/dimples/client/messenger.py

@@ -62,14 +62,27 @@ class ClientMessenger(CommonMessenger):
             facebook = self.facebook
             user = facebook.current_user
             assert user is not None, 'current user not found'
+            meta = user.meta
+            visa = user.visa
+            if visa is None:
+                self.warning(msg='user visa not found: %s' % user)
+            else:
+                device = {
+                    'os': 'Linux',
+                }
+                visa.set_property(key='sys', value=device)
+                # sign to update
+                pri_key = facebook.private_key_for_visa_signature(identifier=user.identifier)
+                assert pri_key is not None, 'failed to get private key for visa: %s' % visa
+                visa.sign(private_key=pri_key)
             env = Envelope.create(sender=user.identifier, receiver=srv_id)
             cmd = HandshakeCommand.start()
             # send first handshake command as broadcast message
             cmd.group = Station.EVERY
             # create instant message with meta & visa
             i_msg = InstantMessage.create(head=env, body=cmd)
-            i_msg.set_map(key='meta', value=user.meta)
-            i_msg.set_map(key='visa', value=user.visa)
+            i_msg.set_map(key='meta', value=meta)
+            i_msg.set_map(key='visa', value=visa)
             self.send_instant_message(msg=i_msg, priority=-1)
         else:
             # handshake again

{dimples-0.5.1 → dimples-0.5.3}/dimples/client/processor.py

@@ -37,18 +37,17 @@ from dimsdk import ReliableMessage
 from dimsdk import Content, TextContent
 from dimsdk import ReceiptCommand
 from dimsdk import ContentProcessorCreator
-from dimsdk import MessageProcessor
 
-from ..utils import Logging
 from ..common import HandshakeCommand
 from ..common import CommonMessenger
+from ..common import CommonMessageProcessor
 
 from .cpu import ClientContentProcessorCreator
 
 from .archivist import ClientArchivist
 
 
-class ClientMessageProcessor(MessageProcessor, Logging):
+class ClientMessageProcessor(CommonMessageProcessor):
 
     @property
     def messenger(self) -> CommonMessenger:
@@ -56,10 +55,11 @@ class ClientMessageProcessor(MessageProcessor, Logging):
         assert isinstance(transceiver, CommonMessenger), 'messenger error: %s' % transceiver
         return transceiver
 
-    def __check_group_times(self, content: Content, r_msg: ReliableMessage):
+    # private
+    def _check_group_times(self, content: Content, r_msg: ReliableMessage) -> bool:
         group = content.group
         if group is None:
-            return
+            return False
         facebook = self.facebook
         archivist = facebook.archivist
         assert isinstance(archivist, ClientArchivist), 'client archivist error: %s' % archivist
@@ -70,27 +70,33 @@ class ClientMessageProcessor(MessageProcessor, Logging):
         last_doc_time = r_msg.get_datetime(key='GDT', default=None)
         if last_doc_time is not None:
             if last_doc_time.after(now):
+                # calibrate the clock
                 last_doc_time = now
             doc_updated = archivist.set_last_document_time(identifier=group, last_time=last_doc_time)
+            # check whether needs update
+            if doc_updated:
+                self.info(msg='checking for new bulletin: %s' % group)
+                facebook.documents(identifier=group)
         # check group history time
         last_his_time = r_msg.get_datetime(key='GHT', default=None)
         if last_his_time is not None:
             if last_his_time.after(now):
+                # calibrate the clock
                 last_his_time = now
             mem_updated = archivist.set_last_group_history_time(group=group, last_time=last_his_time)
-        # check whether needs update
-        if doc_updated:
-            facebook.documents(identifier=group)
-        if mem_updated:
-            archivist.set_last_active_member(member=r_msg.sender, group=group)
-            facebook.members(identifier=group)
+            # check whether needs update
+            if mem_updated:
+                archivist.set_last_active_member(member=r_msg.sender, group=group)
+                self.info(msg='checking for group members: %s' % group)
+                facebook.members(identifier=group)
+        return doc_updated or mem_updated
 
     # Override
     def process_content(self, content: Content, r_msg: ReliableMessage) -> List[Content]:
         responses = super().process_content(content=content, r_msg=r_msg)
         # check group document & history times from the message
         # to make sure the group info synchronized
-        self.__check_group_times(content=content, r_msg=r_msg)
+        self._check_group_times(content=content, r_msg=r_msg)
         # check responses
         if len(responses) == 0:
             # respond nothing

{dimples-0.5.1 → dimples-0.5.3}/dimples/common/__init__.py

@@ -40,6 +40,7 @@ from .archivist import CommonArchivist
 from .facebook import CommonFacebook
 from .messenger import CommonMessenger
 from .packer import CommonMessagePacker
+from .processer import CommonMessageProcessor
 from .session import Transmitter, Session
 
 from .compat import register_compatible_factories
@@ -87,6 +88,7 @@ __all__ = [
     'CommonFacebook',
     'CommonMessenger',
     'CommonMessagePacker',
+    'CommonMessageProcessor',
     'Transmitter',
     'Session',
 

{dimples-0.5.1 → 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
@@ -168,26 +168,57 @@ class CommonMessenger(Messenger, Transmitter, Logging, ABC):
         r_msg = self.send_instant_message(msg=i_msg, priority=priority)
         return i_msg, r_msg
 
+    # private
+    def _attach_visa_time(self, sender: ID, msg: InstantMessage) -> bool:
+        if isinstance(msg.content, DocumentCommand):
+            # no need to attach times for command
+            return True
+        doc = self.facebook.visa(identifier=sender)
+        if doc is None:
+            self.error(msg='failed to get visa document for sender: %s' % sender)
+            return False
+        # attach sender document time
+        last_doc_time = doc.time
+        if last_doc_time is None:
+            self.error(msg='document error: %s' % doc)
+            return False
+        else:
+            msg.set_datetime(key='SDT', value=last_doc_time)
+        return True
+
     # Override
     def send_instant_message(self, msg: InstantMessage, priority: int = 0) -> Optional[ReliableMessage]:
         """ send instant message with priority """
+        sender = msg.sender
         # 0. check cycled message
-        if msg.sender == msg.receiver:
-            self.warning(msg='drop cycled message: %s => %s, %s' % (msg.sender, msg.receiver, msg.group))
+        if sender == msg.receiver:
+            self.warning(msg='drop cycled message: %s => %s, %s' % (sender, msg.receiver, msg.group))
+            # return None
         else:
             self.debug(msg='send instant message message (type=%d): %s => %s, %s'
-                           % (msg.content.type, msg.sender, msg.receiver, msg.group))
-        # 1. encrypt message
+                           % (msg.content.type, sender, msg.receiver, msg.group))
+            # attach sender's document times
+            # for the receiver to check whether user info synchronized
+            ok = self._attach_visa_time(sender=sender, msg=msg)
+            if not ok:
+                self.warning(msg='failed to attach document time: %s => %s' % (sender, msg.content))
+        #
+        #  1. encrypt message
+        #
         s_msg = self.encrypt_message(msg=msg)
         if s_msg is None:
             # public key not found?
             return None
-        # 2. sign message
+        #
+        #  2. sign message
+        #
         r_msg = self.sign_message(msg=s_msg)
         if r_msg is None:
             # TODO: set msg.state = error
             raise AssertionError('failed to sign message: %s' % s_msg)
-        # 3. send message
+        #
+        #  3. send message
+        #
         if self.send_reliable_message(msg=r_msg, priority=priority):
             return r_msg
         # failed

dimples-0.5.3/dimples/common/processer.py

@@ -0,0 +1,70 @@
+# -*- coding: utf-8 -*-
+# ==============================================================================
+# MIT License
+#
+# Copyright (c) 2023 Albert Moky
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+# ==============================================================================
+
+from abc import ABC
+from typing import List
+
+from dimsdk import DateTime
+from dimsdk import Content
+from dimsdk import ReliableMessage
+from dimsdk import MessageProcessor
+
+from ..utils import Logging
+
+from .archivist import CommonArchivist
+
+
+# noinspection PyAbstractClass
+class CommonMessageProcessor(MessageProcessor, Logging, ABC):
+
+    # private
+    # noinspection PyUnusedLocal
+    def _check_visa_time(self, content: Content, r_msg: ReliableMessage) -> bool:
+        facebook = self.facebook
+        archivist = facebook.archivist
+        assert isinstance(archivist, CommonArchivist), 'archivist error: %s' % archivist
+        doc_updated = False
+        # check sender document time
+        last_doc_time = r_msg.get_datetime(key='SDT', default=None)
+        if last_doc_time is not None:
+            now = DateTime.now()
+            if last_doc_time.after(now):
+                # calibrate the clock
+                last_doc_time = now
+            sender = r_msg.sender
+            doc_updated = archivist.set_last_document_time(identifier=sender, last_time=last_doc_time)
+            # check whether needs update
+            if doc_updated:
+                self.info(msg='checking for new visa: %s' % sender)
+                facebook.documents(identifier=sender)
+        return doc_updated
+
+    # Override
+    def process_content(self, content: Content, r_msg: ReliableMessage) -> List[Content]:
+        responses = super().process_content(content=content, r_msg=r_msg)
+        # check sender's document times from the message
+        # to make sure the user info synchronized
+        self._check_visa_time(content=content, r_msg=r_msg)
+        return responses

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

@@ -93,19 +93,21 @@ class GroupEmitter(Logging):
     def messenger(self) -> CommonMessenger:
         return self.delegate.messenger
 
-    def __attach_group_times(self, group: ID, msg: InstantMessage):
+    # private
+    def _attach_group_times(self, group: ID, msg: InstantMessage) -> bool:
         if isinstance(msg.content, GroupCommand):
             # no need to attach times for group command
-            return
+            return True
         facebook = self.facebook
         doc = facebook.bulletin(identifier=group)
         if doc is None:
             self.error(msg='failed to get bulletin document for group: %s' % group)
-            return
+            return False
         # attach group document time
         last_doc_time = doc.time
         if last_doc_time is None:
             self.error(msg='document error: %s' % doc)
+            return False
         else:
             msg.set_datetime(key='GDT', value=last_doc_time)
         # attach group history time
@@ -113,8 +115,10 @@ class GroupEmitter(Logging):
         last_his_time = archivist.get_last_group_history_time(group=group)
         if last_his_time is None:
             self.error(msg='failed to get history time: %s' % group)
+            return False
         else:
             msg.set_datetime(key='GHT', value=last_his_time)
+        return True
 
     def send_message(self, msg: InstantMessage, priority: int = 0) -> Optional[ReliableMessage]:
         content = msg.content
@@ -125,7 +129,9 @@ class GroupEmitter(Logging):
         assert msg.receiver == group, 'group message error: %s' % msg
         # attach group document & history times
         # for the receiver to check whether group info synchronized
-        self.__attach_group_times(group=group, msg=msg)
+        ok = self._attach_group_times(group=group, msg=msg)
+        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.1 → dimples-0.5.3}/dimples/server/cpu/handshake.py

@@ -30,8 +30,9 @@
     Handshake Protocol
 """
 
-from typing import List
+from typing import Optional, List
 
+from dimsdk import DateTime
 from dimsdk import ID, Content, ReliableMessage
 
 from dimsdk.cpu import BaseCommandProcessor
@@ -75,7 +76,7 @@ class HandshakeCommandProcessor(BaseCommandProcessor):
             # session key match
             Log.info(msg='handshake accepted: %s, session: %s' % (sender, session.key))
             # verified success
-            handshake_accepted(identifier=sender, session=session, messenger=messenger)
+            handshake_accepted(identifier=sender, when=content.time, session=session, messenger=messenger)
             res = HandshakeCommand.success(session=session.key)
         else:
             # session key not match
@@ -85,12 +86,12 @@ class HandshakeCommandProcessor(BaseCommandProcessor):
         return [res]
 
 
-def handshake_accepted(identifier: ID, session: Session, messenger: CommonMessenger):
+def handshake_accepted(identifier: ID, when: Optional[DateTime], session: Session, messenger: CommonMessenger):
     from ..session_center import SessionCenter
     center = SessionCenter()
     # 1. update session ID
     center.update_session(session=session, identifier=identifier)
     # 2. update session flag
-    session.set_active(active=True)
+    session.set_active(active=True, when=when)
     # 3. callback
     messenger.handshake_success()

{dimples-0.5.1 → dimples-0.5.3}/dimples/server/cpu/login.py

@@ -85,7 +85,7 @@ class LoginCommandProcessor(BaseCommandProcessor, Logging):
             self.info(msg='user login: %s -> %s, forwarded by %s' % (sender, roaming, session.identifier))
             return []
         # 3. update session flag
-        session.set_active(active=True)
+        session.set_active(active=True, when=content.time)
         # only respond the user login to this station
         self.info(msg='user login: %s -> %s' % (sender, roaming))
         text = 'Login received.'

{dimples-0.5.1 → 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.1 → dimples-0.5.3}/dimples/server/processor.py

@@ -38,16 +38,14 @@ from dimsdk import Envelope
 from dimsdk import Content, ContentType, Command
 from dimsdk import TextContent, ReceiptCommand
 from dimsdk import ContentProcessor, ContentProcessorCreator
-from dimsdk import MessageProcessor
 
 from dimsdk.cpu import BaseContentProcessor, BaseContentProcessorCreator
 
-from ..utils import get_msg_info
-from ..utils import Logging
 from ..common import HandshakeCommand, LoginCommand
 from ..common import ReportCommand, AnsCommand
 from ..common import CommonFacebook, CommonMessenger
 from ..common import CommonMessagePacker
+from ..common import CommonMessageProcessor
 
 from .cpu import HandshakeCommandProcessor
 from .cpu import LoginCommandProcessor
@@ -61,7 +59,7 @@ from .dispatcher import Dispatcher
 from .archivist import ServerArchivist
 
 
-class ServerMessageProcessor(MessageProcessor, Logging):
+class ServerMessageProcessor(CommonMessageProcessor):
 
     @property
     def messenger(self) -> CommonMessenger:
@@ -166,9 +164,6 @@ class ServerMessageProcessor(MessageProcessor, Logging):
         # 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.1 → dimples-0.5.3}/dimples.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dimples
-Version: 0.5.1
+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.1 → dimples-0.5.3}/dimples.egg-info/SOURCES.txt

@@ -38,6 +38,7 @@ dimples/common/archivist.py
 dimples/common/facebook.py
 dimples/common/messenger.py
 dimples/common/packer.py
+dimples/common/processer.py
 dimples/common/register.py
 dimples/common/session.py
 dimples/common/compat/__init__.py

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

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