dimples 1.2.0__tar.gz → 1.2.1__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dimples
-Version: 1.2.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.2.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.2.0 → dimples-1.2.1}/dimples/client/network/state.py

@@ -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.2.0 → dimples-1.2.1}/dimples/conn/flexible.py

@@ -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.2.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.2.0 → dimples-1.2.1}/dimples/conn/ws.py

@@ -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.2.0 → dimples-1.2.1}/dimples/server/dispatcher.py

@@ -133,7 +133,7 @@ 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.async_task(coro=runner.start())
             Runner.thread_run(runner=runner)
         return runner
 

{dimples-1.2.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.2.0 → dimples-1.2.1}/dimples/server/push.py

@@ -124,7 +124,7 @@ class PushCenter(Runner, Logging):
         self.__queue = MessageQueue()
         self.__keeper = BadgeKeeper()
         self.__service: Optional[PushService] = None
-        # Runner.async_run(coroutine=self.start())
+        # Runner.async_task(coro=self.start())
         Runner.thread_run(runner=self)
 
     @property

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

@@ -95,8 +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)
+            coro = load_cached_messages(session=self)
+            Runner.async_task(coro=coro)
             return True
 
     # Override
@@ -104,8 +104,8 @@ 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)
+            coro = load_cached_messages(session=self)
+            Runner.async_task(coro=coro)
             return True
 
     #

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

@@ -51,10 +51,11 @@ from dimsdk import DocumentHelper
 from dimplugins.crypto.aes import random_bytes
 
 from startrek.skywalker import Singleton
-from startrek.skywalker import Runnable, Runner, Daemon
+from startrek.skywalker import Runnable, Daemon
 from startrek.fsm import Delegate as StateDelegate
 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

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

@@ -32,9 +32,9 @@
 from typing import TypeVar, Generic, Optional, Dict, Set, Tuple
 
 from startrek.skywalker import Singleton
-from startrek.skywalker import Runner
 from dimsdk import DateTime
 
+from .runner import PatchRunner as Runner
 from .log import Logging
 
 
@@ -141,7 +141,7 @@ class CacheManager(Runner, Logging):
         super().__init__(interval=2.0)
         self.__pools: Dict[str, CachePool] = {}  # name -> pool
         self.__next_time = DateTime.now()
-        # Runner.async_run(coroutine=self.start())
+        # Runner.async_task(coro=self.start())
         Runner.thread_run(runner=self)
 
     # Override

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.2.0 → dimples-1.2.1}/dimples.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dimples
-Version: 1.2.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.2.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.2.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.1.0
-tcp>=2.1.0
-udp>=2.1.0
+startrek>=2.1.1
+tcp>=2.1.1
+udp>=2.1.1

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

@@ -14,7 +14,7 @@ import io
 
 from setuptools import setup, find_packages
 
-__version__ = '1.2.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.1.0',
-        'tcp>=2.1.0',
-        'udp>=2.1.0',
+        'startrek>=2.1.1',
+        'tcp>=2.1.1',
+        'udp>=2.1.1',
     ]
 )