dimples 0.5.2__tar.gz → 0.5.5__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dimples
-Version: 0.5.2
+Version: 0.5.5
 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.5}/dimples/client/network/session.py

@@ -40,11 +40,11 @@ from typing import Optional, List
 
 from dimsdk import Station
 
-from startrek.fsm import Daemon
 from startrek.fsm import Delegate as StateDelegate
 from startrek import Docker, DockerStatus
 from startrek import Arrival
 
+from ...utils import Daemon
 from ...common import SessionDBI
 from ...conn import BaseSession
 from ...conn import MTPStreamArrival
@@ -84,7 +84,7 @@ class ClientSession(BaseSession):
         # state machine
         self.__fsm = StateMachine(session=self)
         # background thread to drive gate & hub processing
-        self.__daemon = Daemon(target=self.run)
+        self.__daemon = Daemon(target=self)
 
     @property
     def station(self) -> Station:

{dimples-0.5.2 → dimples-0.5.5}/dimples/client/terminal.py

@@ -30,12 +30,11 @@
     Client
 """
 
-import threading
 import time
 
 from dimples import EntityType
 
-from ..utils import Runner, Logging
+from ..utils import Runner, Daemon, Logging
 from ..utils import StateDelegate
 
 from .network import ClientSession
@@ -59,6 +58,7 @@ class Terminal(Runner, DeviceMixin, Logging, StateDelegate):
         self.__messenger = messenger
         # default online time
         self.__last_time = time.time()
+        self.__daemon = Daemon(target=self)
 
     @property
     def messenger(self) -> ClientMessenger:
@@ -74,8 +74,12 @@ class Terminal(Runner, DeviceMixin, Logging, StateDelegate):
             return self.session.running
 
     def start(self):
-        thread = threading.Thread(target=self.run, daemon=True)
-        thread.start()
+        self.__daemon.start()
+
+    # Override
+    def stop(self):
+        self.__daemon.stop()
+        super().stop()
 
     # Override
     def setup(self):

{dimples-0.5.2 → dimples-0.5.5}/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.5}/dimples/edge/octopus.py

@@ -41,7 +41,7 @@ from dimsdk import ReliableMessage
 from dimsdk import Station
 
 from ..utils import Log, Logging
-from ..utils import Runner
+from ..utils import Runner, Daemon
 from ..utils import get_msg_sig
 from ..common import ProviderInfo
 from ..common import MessageDBI, SessionDBI
@@ -67,6 +67,7 @@ class Octopus(Runner, Logging):
         self.__outers: Set[Terminal] = set()
         self.__outer_map = weakref.WeakValueDictionary()
         self.__outer_lock = threading.Lock()
+        self.__daemon = Daemon(target=self, daemonic=False)
 
     @property
     def shared(self) -> GlobalVariable:
@@ -129,8 +130,7 @@ class Octopus(Runner, Logging):
             return terminal
 
     def start(self):
-        thread = threading.Thread(target=self.run)
-        thread.start()
+        self.__daemon.start()
 
     # Override
     def stop(self):

{dimples-0.5.2 → dimples-0.5.5}/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.5}/dimples/server/dispatcher.py

@@ -34,13 +34,11 @@ import threading
 from abc import ABC, abstractmethod
 from typing import Optional, List
 
-from startrek.fsm import Daemon
-
 from dimsdk import EntityType, ID
 from dimsdk import Content, ReceiptCommand
 from dimsdk import ReliableMessage
 
-from ..utils import Singleton, Logging, Runner
+from ..utils import Singleton, Logging, Runner, Daemon
 from ..common import CommonFacebook
 from ..common import MessageDBI, SessionDBI
 from ..common import ReliableMessageDBI
@@ -211,7 +209,7 @@ class Roamer(Runner, Logging):
         # roaming (user id => station id)
         self.__queue: List[RoamingInfo] = []
         self.__lock = threading.Lock()
-        self.__daemon = Daemon(target=self.run)
+        self.__daemon = Daemon(target=self)
 
     @property
     def database(self) -> Optional[MessageDBI]:

{dimples-0.5.2 → dimples-0.5.5}/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.5}/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.5}/dimples/server/push.py

@@ -36,10 +36,10 @@ import time
 from abc import ABC, abstractmethod
 from typing import Optional, List, Dict
 
-from startrek.fsm import Daemon
 from dimsdk import ID, ReliableMessage
 
-from ..utils import Singleton, Logging, Runner
+from ..utils import Runner, Daemon
+from ..utils import Singleton, Logging
 
 
 class MessageQueue(Logging):
@@ -125,9 +125,8 @@ class PushCenter(Runner, Logging):
         self.__keeper = BadgeKeeper()
         self.__service: Optional[PushService] = None
         # background thread
-        daemon = Daemon(target=self.run)
-        daemon.start()
-        self.__daemon = daemon
+        self.__daemon = Daemon(target=self)
+        self.__daemon.start()
 
     @property
     def service(self) -> Optional[PushService]:

{dimples-0.5.2 → dimples-0.5.5}/dimples/utils/__init__.py

@@ -50,7 +50,7 @@ from dimsdk import DocumentHelper
 
 from dimplugins.crypto.aes import random_bytes
 
-from startrek.fsm import Runnable, Runner
+from startrek.fsm import Runnable, Runner, Daemon
 from startrek.fsm import Delegate as StateDelegate
 from startrek.net.channel import get_remote_address, get_local_address
 
@@ -122,7 +122,7 @@ __all__ = [
 
     'Converter',
 
-    'Runnable', 'Runner',
+    'Runnable', 'Runner', 'Daemon',
     'StateDelegate',
 
     'get_remote_address', 'get_local_address',

{dimples-0.5.2 → dimples-0.5.5}/dimples/utils/cache.py

@@ -32,7 +32,7 @@
 import time
 from typing import TypeVar, Generic, Optional, Dict, Set, Tuple
 
-from startrek.fsm import Daemon
+from startrek.fsm import Daemon, Runnable
 from dimsdk import DateTime
 
 from .singleton import Singleton
@@ -135,12 +135,12 @@ class CachePool(Generic[K, V]):
 
 
 @Singleton
-class CacheManager:
+class CacheManager(Runnable):
 
     def __init__(self):
         self.__pools: Dict[str, CachePool] = {}  # name -> pool
         # thread for cleaning caches
-        self.__daemon = Daemon(target=self.run)
+        self.__daemon = Daemon(target=self)
         self.__running = False
 
     @property
@@ -154,6 +154,7 @@ class CacheManager:
     def stop(self):
         self.__daemon.stop()
 
+    # Override
     def run(self):
         next_time = 0
         while self.running:

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dimples
-Version: 0.5.2
+Version: 0.5.5
 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.5}/dimples.egg-info/requires.txt

@@ -3,6 +3,6 @@ dimsdk>=1.0.3
 dimp>=1.0.3
 dkd>=1.0.2
 mkm>=1.0.2
-startrek>=1.1.2
-tcp>=1.1.2
-udp>=1.1.2
+startrek>=1.2.0
+tcp>=1.2.0
+udp>=1.2.0

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

@@ -14,7 +14,7 @@ import io
 
 from setuptools import setup, find_packages
 
-__version__ = '0.5.2'
+__version__ = '0.5.5'
 __author__ = 'Albert Moky'
 __contact__ = 'albert.moky@gmail.com'
 
@@ -58,8 +58,8 @@ setup(
         'dkd>=1.0.2',
         'mkm>=1.0.2',
 
-        'startrek>=1.1.2',
-        'tcp>=1.1.2',
-        'udp>=1.1.2',
+        'startrek>=1.2.0',
+        'tcp>=1.2.0',
+        'udp>=1.2.0',
     ]
 )