dimples 1.1.0__tar.gz → 1.2.1__tar.gz

{dimples-1.1.0 → dimples-1.2.1}/PKG-INFO

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

{dimples-1.1.0 → dimples-1.2.1}/dimples/client/network/session.py

@@ -118,6 +118,7 @@ class ClientSession(BaseSession):
         await fsm.start()
         # 3. start an async task for this session
         self.__daemon.start()
+        # await self.run()
 
     # Override
     async def stop(self):

{dimples-1.1.0 → dimples-1.2.1}/dimples/client/network/state.py

@@ -31,7 +31,7 @@ from typing import Optional, Union
 
 from dimsdk import ID
 
-from startrek.fsm import Runner
+from startrek.skywalker import Runner
 from startrek.fsm import Context, BaseTransition, BaseState, AutoMachine
 from startrek import Docker, DockerStatus
 
@@ -97,7 +97,8 @@ class StateMachine(AutoMachine, Context):
         else:
             session = self.session
             gate = session.gate
-            task = Runner.async_run(coroutine=gate.fetch_docker([], remote=session.remote_address, local=None))
+            coro = gate.fetch_docker([], remote=session.remote_address, local=None)
+            task = Runner.async_task(coro=coro)
             task.add_done_callback(self._fetch_docker_callback)
         # waiting for callback
         return DockerStatus.ERROR

{dimples-1.1.0 → dimples-1.2.1}/dimples/client/terminal.py

@@ -34,7 +34,8 @@ import time
 
 from dimples import EntityType
 
-from ..utils import DaemonRunner, Logging
+from ..utils import Logging
+from ..utils import Runner
 from ..utils import StateDelegate
 
 from .network import ClientSession
@@ -51,7 +52,7 @@ class DeviceMixin:
         return 'DIMP/0.4 (Client; Linux; en-US) DIMCoreKit/0.9 (Terminal) DIM-by-GSP/1.0'
 
 
-class Terminal(DaemonRunner, DeviceMixin, Logging, StateDelegate):
+class Terminal(Runner, DeviceMixin, Logging, StateDelegate):
 
     def __init__(self, messenger: ClientMessenger):
         super().__init__(interval=60)
@@ -74,7 +75,6 @@ class Terminal(DaemonRunner, DeviceMixin, Logging, StateDelegate):
 
     # Override
     async def setup(self):
-        await super().setup()
         session = self.session
         session.fsm.delegate = self
         await session.start()
@@ -82,7 +82,6 @@ class Terminal(DaemonRunner, DeviceMixin, Logging, StateDelegate):
     # Override
     async def finish(self):
         await self.session.stop()
-        await super().finish()
 
     # Override
     async def process(self) -> bool:

{dimples-1.1.0 → dimples-1.2.1}/dimples/common/dbi/session.py

@@ -213,11 +213,13 @@ class StationDBI(ABC):
         raise NotImplemented
 
     @abstractmethod
-    async def add_station(self, identifier: Optional[ID], host: str, port: int, provider: ID, chosen: int = 0) -> bool:
+    async def add_station(self, identifier: Optional[ID], host: str, port: int, provider: ID,
+                          chosen: int = 0) -> bool:
         raise NotImplemented
 
     @abstractmethod
-    async def update_station(self, identifier: Optional[ID], host: str, port: int, provider: ID, chosen: int = None) -> bool:
+    async def update_station(self, identifier: Optional[ID], host: str, port: int, provider: ID,
+                             chosen: int = None) -> bool:
         raise NotImplemented
 
     @abstractmethod

{dimples-1.1.0 → dimples-1.2.1}/dimples/conn/flexible.py

@@ -31,7 +31,7 @@
 from typing import Optional, Union, List
 
 from startrek.types import SocketAddress
-from startrek.fsm import Runner
+from startrek.skywalker import Runner
 from startrek import Connection
 from startrek import Arrival, Departure
 from startrek import StarDocker
@@ -65,7 +65,8 @@ class FlexibleDocker(StarDocker, DeparturePacker):
             return None
         # OK
         docker.delegate = self.delegate
-        Runner.async_run(coroutine=docker.set_connection(conn=self.connection))
+        coro = docker.set_connection(conn=self.connection)
+        Runner.async_task(coro=coro)
         self.__docker = docker
         return docker
 

{dimples-1.1.0 → dimples-1.2.1}/dimples/conn/gatekeeper.py

@@ -182,7 +182,8 @@ class GateKeeper(Runner, DockerDelegate, Logging):
             # client
             assert address is not None, 'remote address empty'
             hub = StreamClientHub(delegate=delegate)
-            Runner.async_run(coroutine=_client_connect(hub=hub, address=address))
+            coro = _client_connect(hub=hub, address=address)
+            Runner.async_task(coro=coro)
             self.info(msg='client hub created: %s' % str(address))
         else:
             # server
@@ -191,7 +192,8 @@ class GateKeeper(Runner, DockerDelegate, Logging):
             if address is None:
                 address = get_remote_address(sock=sock)
             channel = StreamChannel(remote=address, local=get_local_address(sock=sock))
-            Runner.async_run(coroutine=channel.set_socket(sock=sock))
+            coro = channel.set_socket(sock=sock)
+            Runner.async_task(coro=coro)
             hub = StreamServerHub(delegate=delegate)
             hub.put_channel(channel=channel)
         return hub

{dimples-1.1.0 → dimples-1.2.1}/dimples/conn/queue.py

@@ -112,10 +112,10 @@ class MessageQueue:
                 self.__insert(priority=priority)
             else:
                 # 1.3. check duplicated
-                signature = msg.get('signature')
                 for wrapper in fleet:
                     item = wrapper.msg
                     if self.__is_duplicated(item, msg):
+                        signature = msg.get('signature')
                         print('[QUEUE] duplicated message: %s' % signature)
                         return False
             # 2. append with wrapper

{dimples-1.1.0 → dimples-1.2.1}/dimples/conn/session.py

@@ -87,7 +87,9 @@ class BaseSession(GateKeeper, Session, ABC):
     # Override
     async def queue_message_package(self, msg: ReliableMessage, data: bytes, priority: int = 0) -> bool:
         ship = await self._docker_pack(payload=data, priority=priority)
-        if ship is not None:
+        if ship is None:
+            self.error(msg='failed to pack msg: %s -> %s, %s' % (msg.sender, msg.receiver, msg.group))
+        else:
             return self._queue_append(msg=msg, ship=ship)
 
     #

{dimples-1.1.0 → dimples-1.2.1}/dimples/conn/ws.py

@@ -33,7 +33,7 @@ import threading
 from typing import Optional, List, Tuple
 
 from startrek.types import SocketAddress
-from startrek.fsm import Runner
+from startrek.skywalker import Runner
 from startrek import Arrival, Departure
 from startrek import ArrivalShip, DepartureShip, DeparturePriority
 from startrek import BaseConnection, BaseChannel
@@ -164,7 +164,8 @@ class WSDocker(PlainDocker, DeparturePacker):
             res = WebSocket.handshake(stream=data)
             if res is not None:
                 ship = WSDeparture(package=res, payload=b'')
-                Runner.async_run(coroutine=self.send_ship(ship=ship))
+                coro = self.send_ship(ship=ship)
+                Runner.async_task(coro=coro)
                 self.__handshaking = False
             elif len(data) < self.MAX_PACK_LENGTH:
                 # waiting for more data

{dimples-1.1.0 → dimples-1.2.1}/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, DaemonRunner
+from ..utils import Runner
 from ..utils import get_msg_sig
 from ..common import ProviderInfo
 from ..common import MessageDBI, SessionDBI
@@ -58,7 +58,7 @@ from .shared import GlobalVariable
 from .shared import create_session
 
 
-class Octopus(DaemonRunner, Logging):
+class Octopus(Runner, Logging):
 
     def __init__(self, shared: GlobalVariable, local_host: str = '127.0.0.1', local_port: int = 9394):
         super().__init__(interval=60)
@@ -142,6 +142,14 @@ class Octopus(DaemonRunner, Logging):
         # 3. stop runner
         await super().stop()
 
+    # Override
+    async def setup(self):
+        pass
+
+    # Override
+    async def finish(self):
+        pass
+
     # Override
     async def process(self) -> bool:
         # get all neighbor stations
@@ -380,7 +388,7 @@ def create_messenger(facebook: ClientFacebook, database: MessageDBI,
 def create_terminal(messenger: OctopusMessenger) -> Terminal:
     terminal = Terminal(messenger=messenger)
     messenger.terminal = terminal
-    Runner.thread_run(terminal)
+    Runner.thread_run(runner=terminal)
     return terminal
 
 

{dimples-1.1.0 → dimples-1.2.1}/dimples/edge/start.py

@@ -75,8 +75,7 @@ async def main():
     assert host is not None and port > 0, 'station config error: %s' % config
     octopus = Octopus(shared=shared, local_host=host, local_port=port)
     await octopus.start()
-    while octopus.running:
-        await Runner.sleep(seconds=1.0)
+    await octopus.run()
     Log.warning(msg='bot stopped: %s' % octopus)
 
 

{dimples-1.1.0 → dimples-1.2.1}/dimples/group/helper.py

@@ -61,7 +61,7 @@ class GroupCommandHelper(Logging):
     #
 
     async def save_group_history(self, group: ID, content: GroupCommand, message: ReliableMessage) -> bool:
-        if self.is_expired(content=content):
+        if await self.is_expired(content=content):
             self.warning(msg='drop expired command: %s, %s => %s' % (content.cmd, message.sender, group))
             return False
         # check command time
@@ -114,6 +114,7 @@ class GroupCommandHelper(Logging):
         # membership command, check with reset command
         cmd, _ = await self.get_reset_command_message(group=group)
         if cmd is None:  # or msg is None:
+            self.error(msg='"reset" command not found: %s' % content)
             return False
         return is_before(old_time=cmd.time, new_time=content.time)
 

{dimples-1.1.0 → dimples-1.2.1}/dimples/server/dispatcher.py

@@ -39,7 +39,7 @@ from dimsdk import Station
 from dimsdk import Content, ReceiptCommand
 from dimsdk import ReliableMessage
 
-from ..utils import Singleton, Log, Logging, Runner, DaemonRunner
+from ..utils import Singleton, Log, Logging, Runner
 from ..common import CommonFacebook
 from ..common import MessageDBI, SessionDBI
 from ..common import ReliableMessageDBI
@@ -133,8 +133,8 @@ class Dispatcher(MessageDeliver, Logging):
             assert db is not None, 'dispatcher not initialized'
             runner = Roamer(database=db)
             self.__roamer = runner
-            # Runner.async_run(coroutine=runner.start())
-            Runner.thread_run(runner)
+            # Runner.async_task(coro=runner.start())
+            Runner.thread_run(runner=runner)
         return runner
 
     def add_roaming(self, user: ID, station: ID) -> bool:
@@ -275,7 +275,7 @@ class RoamingInfo:
         self.station = station
 
 
-class Roamer(DaemonRunner, Logging):
+class Roamer(Runner, Logging):
     """ Delegate for redirect cached messages to roamed station """
 
     def __init__(self, database: MessageDBI):
@@ -310,6 +310,14 @@ class Roamer(DaemonRunner, Logging):
         self.__append(info=info)
         return True
 
+    # Override
+    async def setup(self):
+        pass
+
+    # Override
+    async def finish(self):
+        pass
+
     # Override
     async def process(self) -> bool:
         info = self.__next()

{dimples-1.1.0 → dimples-1.2.1}/dimples/server/packer.py

@@ -143,6 +143,8 @@ class MuteFilter(Logging):
     """ Filter for Push Notification service """
 
     async def is_muted(self, msg: ReliableMessage) -> bool:
+        if msg.get_bool(key='muted', default=False):
+            return True
         sender = msg.sender
         receiver = msg.receiver
         group = msg.group
@@ -152,7 +154,7 @@ class MuteFilter(Logging):
             return True
         elif sender.type == EntityType.BOT:
             # mute group message from bot
-            return group is not None or receiver.is_group
+            return receiver.is_group or group is not None or 'GF' in msg
         elif receiver.type == EntityType.BOT:
             # mute all messages to bots
             return True

{dimples-1.1.0 → dimples-1.2.1}/dimples/server/push.py

@@ -38,7 +38,7 @@ from typing import Optional, List, Dict
 
 from dimsdk import ID, ReliableMessage
 
-from ..utils import Runner, DaemonRunner
+from ..utils import Runner
 from ..utils import Singleton, Logging
 
 
@@ -117,15 +117,15 @@ class PushService(ABC):
 
 
 @Singleton
-class PushCenter(DaemonRunner, Logging):
+class PushCenter(Runner, Logging):
 
     def __init__(self):
         super().__init__(interval=Runner.INTERVAL_SLOW)
         self.__queue = MessageQueue()
         self.__keeper = BadgeKeeper()
         self.__service: Optional[PushService] = None
-        # Runner.async_run(coroutine=self.start())
-        Runner.thread_run(self)
+        # Runner.async_task(coro=self.start())
+        Runner.thread_run(runner=self)
 
     @property
     def service(self) -> Optional[PushService]:
@@ -149,6 +149,14 @@ class PushCenter(DaemonRunner, Logging):
         queue = self.__queue
         queue.add_message(msg=msg)
 
+    # Override
+    async def setup(self):
+        pass
+
+    # Override
+    async def finish(self):
+        pass
+
     # Override
     async def process(self) -> bool:
         # 1. get waiting messages

{dimples-1.1.0 → dimples-1.2.1}/dimples/server/session.py

@@ -95,9 +95,8 @@ class ServerSession(BaseSession):
         if super().set_identifier(identifier=identifier):
             session_change_id(session=self, new_id=identifier, old_id=old)
             # load cached message asynchronously
-            crt = load_cached_messages(session=self)
-            # Runner.async_run(coroutine=crt)
-            Runner.thread_run(crt)
+            coro = load_cached_messages(session=self)
+            Runner.async_task(coro=coro)
             return True
 
     # Override
@@ -105,16 +104,10 @@ class ServerSession(BaseSession):
         if super().set_active(active=active, when=when):
             session_change_active(session=self, active=active)
             # load cached message asynchronously
-            crt = load_cached_messages(session=self)
-            # Runner.async_run(coroutine=crt)
-            Runner.thread_run(crt)
+            coro = load_cached_messages(session=self)
+            Runner.async_task(coro=coro)
             return True
 
-    # Override
-    async def start(self):
-        await super().start()
-        await self.run()
-
     #
     #   Docker Delegate
     #

{dimples-1.1.0 → dimples-1.2.1}/dimples/station/handler.py

@@ -64,14 +64,15 @@ class RequestHandler(StreamRequestHandler, Logging):
         super().handle()
         try:
             self.info(msg='session started: %s' % str(self.client_address))
-            Runner.sync_run(main=start_session(client_address=self.client_address, request=self.request))
+            crt = _start_session(client_address=self.client_address, request=self.request)
+            Runner.sync_run(main=crt)
             self.info(msg='session finished: %s' % str(self.client_address))
         except Exception as error:
             self.error(msg='request handler error: %s' % error)
             traceback.print_exc()
 
 
-async def start_session(client_address, request):
+async def _start_session(client_address, request):
     shared = GlobalVariable()
     session = ServerSession(remote=client_address, sock=request, database=shared.sdb)
     messenger = create_messenger(facebook=shared.facebook, database=shared.mdb, session=session)
@@ -81,6 +82,8 @@ async def start_session(client_address, request):
     try:
         # handle
         await session.start()
+        await session.run()
+        # await session.stop()
     finally:
         # finish
         center.remove_session(session=session)

{dimples-1.1.0 → dimples-1.2.1}/dimples/utils/__init__.py

@@ -33,7 +33,6 @@
                                              -- Albert Moky @ Jan. 23, 2019
 """
 
-import threading
 from typing import Optional, List, Dict
 
 from dimsdk import md5, sha1, sha256, keccak256, ripemd160
@@ -51,12 +50,12 @@ from dimsdk import DocumentHelper
 
 from dimplugins.crypto.aes import random_bytes
 
-from startrek.fsm import Singleton
-from startrek.fsm import Runnable, Runner, Daemon, DaemonRunner
+from startrek.skywalker import Singleton
+from startrek.skywalker import Runnable, Daemon
 from startrek.fsm import Delegate as StateDelegate
-from startrek.net.channel import get_remote_address, get_local_address
-
+from startrek.net.socket import get_remote_address, get_local_address
 
+from .runner import PatchRunner as Runner
 from .log import Log, Logging
 from .dos import Path, File, TextFile, JSONFile
 from .cache import CachePool, CacheHolder, CacheManager
@@ -123,7 +122,7 @@ __all__ = [
 
     'Converter',
 
-    'Runnable', 'Runner', 'Daemon', 'DaemonRunner',
+    'Runnable', 'Runner', 'Daemon',
     'StateDelegate',
 
     'get_remote_address', 'get_local_address',
@@ -143,37 +142,3 @@ __all__ = [
     'template_replace',
 
 ]
-
-
-#
-#   Patch for Runner
-#
-async def _run_forever(runner: Runner):
-    await runner.start()
-    while True:
-        await Runner.sleep(seconds=2.0)
-        if not runner.running:
-            break
-    Log.warning(msg='runner stopped: %s' % runner)
-
-
-def _start_runner(runner: Runner):
-    Runner.sync_run(main=_run_forever(runner=runner))
-
-
-def _start_coroutine(coroutine):
-    Runner.sync_run(main=coroutine)
-
-
-def _bg_run(target):
-    if isinstance(target, Runner):
-        fn = _start_runner
-    else:
-        fn = _start_coroutine
-    thr = threading.Thread(target=fn, args=(target,), daemon=True)
-    thr.start()
-    return thr
-
-
-""" Run coroutine in background thread """
-Runner.thread_run = _bg_run

{dimples-1.1.0 → dimples-1.2.1}/dimples/utils/cache.py

@@ -31,10 +31,12 @@
 
 from typing import TypeVar, Generic, Optional, Dict, Set, Tuple
 
-from startrek.fsm import Singleton
-from startrek.fsm import Runnable, Runner, Daemon
+from startrek.skywalker import Singleton
 from dimsdk import DateTime
 
+from .runner import PatchRunner as Runner
+from .log import Logging
+
 
 K = TypeVar('K')
 V = TypeVar('V')
@@ -133,44 +135,37 @@ class CachePool(Generic[K, V]):
 
 
 @Singleton
-class CacheManager(Runnable):
+class CacheManager(Runner, Logging):
 
     def __init__(self):
+        super().__init__(interval=2.0)
         self.__pools: Dict[str, CachePool] = {}  # name -> pool
-        # thread for cleaning caches
-        self.__running = True
-        self.__daemon = Daemon(target=self)
-        self.__daemon.start()
+        self.__next_time = DateTime.now()
+        # Runner.async_task(coro=self.start())
+        Runner.thread_run(runner=self)
 
-    @property
-    def running(self) -> bool:
-        return self.__running
+    # Override
+    async def setup(self):
+        pass
 
-    async def stop(self):
-        # 1. mark this gate to stopped
-        self.__running = False
-        # 2. waiting for the gate to stop
-        await Runner.sleep(seconds=5)
-        # 3. cancel the async task
-        self.__daemon.stop()
+    # Override
+    async def finish(self):
+        pass
 
     # Override
-    async def run(self):
-        next_time = 0
-        while self.running:
-            # try to purge each 5 minutes
-            now = DateTime.now()
-            if now < next_time:
-                await Runner.sleep(seconds=2)
-                continue
-            else:
-                next_time = DateTime(now.timestamp + 300)
-            try:
-                count = self.purge(now=now)
-                print('[MEM] purge %d item(s) from cache pools' % count)
-            except Exception as error:
-                print('[MEM] failed to purge cache: %s' % error)
-        print('[MEM] stop %s' % self)
+    async def process(self) -> bool:
+        # try to purge each 5 minutes
+        now = DateTime.now()
+        if now < self.__next_time:
+            return False
+        else:
+            self.__next_time = DateTime(now.timestamp + 300)
+        # purge
+        try:
+            count = self.purge(now=now)
+            self.info(msg='[MEM] purge %d item(s) from cache pools' % count)
+        except Exception as error:
+            self.error(msg='[MEM] failed to purge cache: %s' % error)
 
     def get_pool(self, name: str) -> CachePool[K, V]:
         """ get pool with name """

dimples-1.2.1/dimples/utils/runner.py

@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+
+from threading import Thread
+
+from startrek.skywalker import Runner
+
+
+# noinspection PyAbstractClass
+class PatchRunner(Runner):
+
+    @classmethod
+    def thread_run(cls, runner: Runner) -> Thread:
+        thr = Runner.async_thread(coro=_bg_runner(runner=runner))
+        thr.start()
+        return thr
+
+
+async def _bg_runner(runner: Runner):
+    await runner.start()
+    await runner.run()
+
+
+# Patch for Runner
+Runner.thread_run = PatchRunner.thread_run

{dimples-1.1.0 → dimples-1.2.1}/dimples.egg-info/PKG-INFO

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

{dimples-1.1.0 → dimples-1.2.1}/dimples.egg-info/SOURCES.txt

@@ -138,4 +138,5 @@ dimples/utils/__init__.py
 dimples/utils/cache.py
 dimples/utils/config.py
 dimples/utils/dos.py
-dimples/utils/log.py
+dimples/utils/log.py
+dimples/utils/runner.py

{dimples-1.1.0 → dimples-1.2.1}/dimples.egg-info/requires.txt

@@ -3,6 +3,6 @@ dimsdk>=2.0.0
 dimp>=2.0.0
 dkd>=2.0.0
 mkm>=2.0.0
-startrek>=2.0.0
-tcp>=2.0.0
-udp>=2.0.0
+startrek>=2.1.1
+tcp>=2.1.1
+udp>=2.1.1

{dimples-1.1.0 → dimples-1.2.1}/setup.py

@@ -14,7 +14,7 @@ import io
 
 from setuptools import setup, find_packages
 
-__version__ = '1.1.0'
+__version__ = '1.2.1'
 __author__ = 'Albert Moky'
 __contact__ = 'albert.moky@gmail.com'
 
@@ -58,8 +58,8 @@ setup(
         'dkd>=2.0.0',
         'mkm>=2.0.0',
 
-        'startrek>=2.0.0',
-        'tcp>=2.0.0',
-        'udp>=2.0.0',
+        'startrek>=2.1.1',
+        'tcp>=2.1.1',
+        'udp>=2.1.1',
     ]
 )