dimples 1.2.1__tar.gz → 1.2.3__tar.gz

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

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

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

@@ -147,7 +147,7 @@ class ClientSession(BaseSession):
 
     # Override
     async def docker_status_changed(self, previous: DockerStatus, current: DockerStatus, docker: Docker):
-        # super().docker_status_changed(previous=previous, current=current, docker=docker)
+        # await super().docker_status_changed(previous=previous, current=current, docker=docker)
         if current is None or current == DockerStatus.ERROR:
             # connection error or session finished
             self.set_active(active=False)
@@ -159,7 +159,7 @@ class ClientSession(BaseSession):
 
     # Override
     async def docker_received(self, ship: Arrival, docker: Docker):
-        # super().docker_received(ship=ship, docker=docker)
+        # await super().docker_received(ship=ship, docker=docker)
         all_responses = []
         messenger = self.messenger
         # 1. get data packages from arrival ship's payload

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

@@ -75,6 +75,7 @@ class Terminal(Runner, DeviceMixin, Logging, StateDelegate):
 
     # Override
     async def setup(self):
+        await super().setup()
         session = self.session
         session.fsm.delegate = self
         await session.start()
@@ -82,6 +83,7 @@ class Terminal(Runner, DeviceMixin, Logging, StateDelegate):
     # Override
     async def finish(self):
         await self.session.stop()
+        await super().finish()
 
     # Override
     async def process(self) -> bool:

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

@@ -220,26 +220,6 @@ class GateKeeper(Runner, DockerDelegate, Logging):
             self.__last_active = when
             return True
 
-    # @property  # Override
-    # def running(self) -> bool:
-    #     if super().running:
-    #         return self.gate.running
-    #
-    # # Override
-    # async def stop(self):
-    #     await super().stop()
-    #     await self.gate.stop()
-
-    # Override
-    async def setup(self):
-        # await self.gate.start()
-        pass
-
-    # Override
-    async def finish(self):
-        # await self.gate.stop()
-        pass
-
     # Override
     async def process(self) -> bool:
         gate = self.gate

{dimples-1.2.1 → dimples-1.2.3}/dimples/database/dos/base.py

@@ -85,37 +85,37 @@ class Storage:
             return Path.join(self._public, template)
 
     @classmethod
-    def read_text(cls, path: str) -> Optional[str]:
+    async def read_text(cls, path: str) -> Optional[str]:
         try:
-            return TextFile(path=path).read()
+            return await TextFile(path=path).read()
         except Exception as error:
             Log.error(msg='Storage >\t%s' % error)
 
     @classmethod
-    def read_json(cls, path: str) -> Union[dict, list, None]:
+    async def read_json(cls, path: str) -> Union[dict, list, None]:
         try:
-            return JSONFile(path=path).read()
+            return await JSONFile(path=path).read()
         except Exception as error:
             Log.error(msg='Storage >\t%s' % error)
 
     @classmethod
-    def write_text(cls, text: str, path: str) -> bool:
+    async def write_text(cls, text: str, path: str) -> bool:
         try:
-            return TextFile(path=path).write(text=text)
+            return await TextFile(path=path).write(text=text)
         except Exception as error:
             Log.error(msg='Storage >\t%s' % error)
 
     @classmethod
-    def write_json(cls, container: Union[dict, list], path: str) -> bool:
+    async def write_json(cls, container: Union[dict, list], path: str) -> bool:
         try:
-            return JSONFile(path=path).write(container=container)
+            return await JSONFile(path=path).write(container=container)
         except Exception as error:
             Log.error(msg='Storage >\t%s' % error)
 
     @classmethod
-    def append_text(cls, text: str, path: str) -> bool:
+    async def append_text(cls, text: str, path: str) -> bool:
         try:
-            return TextFile(path=path).append(text=text)
+            return await TextFile(path=path).append(text=text)
         except Exception as error:
             Log.error(msg='Storage >\t%s' % error)
 

{dimples-1.2.1 → dimples-1.2.3}/dimples/database/dos/document.py

@@ -63,13 +63,13 @@ class DocumentStorage(Storage, DocumentDBI):
         for doc in documents:
             assert doc.identifier == identifier, 'document ID not matched: %s, %s' % (identifier, doc)
             array.append(doc.dictionary)
-        return self.write_json(container=array, path=path)
+        return await self.write_json(container=array, path=path)
 
     async def load_documents(self, identifier: ID) -> Optional[List[Document]]:
         """ load documents from file """
         path = self.__all_path(identifier=identifier)
         self.info(msg='Loading documents from: %s' % path)
-        array = self.read_json(path=path)
+        array = await self.read_json(path=path)
         if array is None:
             # file not found
             return None
@@ -86,7 +86,7 @@ class DocumentStorage(Storage, DocumentDBI):
         """ load document from file """
         path = self.__doc_path(identifier=identifier)
         self.info(msg='Loading document from: %s' % path)
-        info = self.read_json(path=path)
+        info = await self.read_json(path=path)
         if info is not None:
             return parse_document(dictionary=info, identifier=identifier)
 

{dimples-1.2.1 → dimples-1.2.3}/dimples/database/dos/group.py

@@ -84,7 +84,7 @@ class GroupStorage(Storage, GroupDBI):
         """ load members from file """
         path = self.__members_path(identifier=group)
         self.info(msg='Loading members from: %s' % path)
-        users = self.read_json(path=path)
+        users = await self.read_json(path=path)
         if users is None:
             # members not found
             return []
@@ -95,14 +95,14 @@ class GroupStorage(Storage, GroupDBI):
         """ save members into file """
         path = self.__members_path(identifier=group)
         self.info(msg='Saving members into: %s' % path)
-        return self.write_json(container=ID.revert(array=members), path=path)
+        return await self.write_json(container=ID.revert(array=members), path=path)
 
     # Override
     async def get_assistants(self, group: ID) -> List[ID]:
         """ load assistants from file """
         path = self.__assistants_path(identifier=group)
         self.info(msg='Loading assistants from: %s' % path)
-        bots = self.read_json(path=path)
+        bots = await self.read_json(path=path)
         if bots is None:
             # assistants not found
             return []
@@ -113,14 +113,14 @@ class GroupStorage(Storage, GroupDBI):
         """ save assistants into file """
         path = self.__assistants_path(identifier=group)
         self.info(msg='Saving assistants into: %s' % path)
-        return self.write_json(container=ID.revert(array=assistants), path=path)
+        return await self.write_json(container=ID.revert(array=assistants), path=path)
 
     # Override
     async def get_administrators(self, group: ID) -> List[ID]:
         """ load administrators from file """
         path = self.__administrators_path(identifier=group)
         self.info(msg='Loading administrators from: %s' % path)
-        users = self.read_json(path=path)
+        users = await self.read_json(path=path)
         if users is None:
             # administrators not found
             return []
@@ -131,4 +131,4 @@ class GroupStorage(Storage, GroupDBI):
         """ save administrators into file """
         path = self.__administrators_path(identifier=group)
         self.info(msg='Saving administrators into: %s' % path)
-        return self.write_json(container=ID.revert(array=administrators), path=path)
+        return await self.write_json(container=ID.revert(array=administrators), path=path)

{dimples-1.2.1 → dimples-1.2.3}/dimples/database/dos/group_history.py

@@ -57,7 +57,7 @@ class GroupHistoryStorage(Storage, GroupHistoryDBI):
     async def load_group_histories(self, group: ID) -> List[Tuple[GroupCommand, ReliableMessage]]:
         path = self.__history_path(group=group)
         self.info(msg='Loading group history from: %s' % path)
-        array = self.read_json(path=path)
+        array = await self.read_json(path=path)
         if array is None:
             # history not found
             return []
@@ -88,7 +88,7 @@ class GroupHistoryStorage(Storage, GroupHistoryDBI):
             array.append(item)
         path = self.__history_path(group=group)
         self.info(msg='Saving %d group history(ies) into: %s' % (len(histories), path))
-        return self.write_json(container=array, path=path)
+        return await self.write_json(container=array, path=path)
 
     #
     #   Group History DBI

{dimples-1.2.1 → dimples-1.2.3}/dimples/database/dos/group_keys.py

@@ -61,11 +61,11 @@ class GroupKeysStorage(Storage, GroupKeysDBI):
         """ load group keys from file """
         path = self.__keys_path(group=group, sender=sender)
         self.info(msg='Loading group keys from: %s' % path)
-        return self.read_json(path=path)
+        return await self.read_json(path=path)
 
     # Override
     async def save_group_keys(self, group: ID, sender: ID, keys: Dict[str, str]) -> bool:
         """ save group keys into file """
         path = self.__keys_path(group=group, sender=sender)
         self.info(msg='Saving group keys into: %s' % path)
-        return self.write_json(container=keys, path=path)
+        return await self.write_json(container=keys, path=path)

{dimples-1.2.1 → dimples-1.2.3}/dimples/database/dos/login.py

@@ -60,7 +60,7 @@ class LoginStorage(Storage, LoginDBI):
         """ load login command from file """
         path = self.__login_path(identifier=user)
         self.info(msg='Loading login command from: %s' % path)
-        info = self.read_json(path=path)
+        info = await self.read_json(path=path)
         if info is None:
             # command not found
             return None, None
@@ -79,4 +79,4 @@ class LoginStorage(Storage, LoginDBI):
         }
         path = self.__login_path(identifier=user)
         self.info(msg='Saving login command into: %s' % path)
-        return self.write_json(container=info, path=path)
+        return await self.write_json(container=info, path=path)

{dimples-1.2.1 → dimples-1.2.3}/dimples/database/dos/meta.py

@@ -58,13 +58,13 @@ class MetaStorage(Storage, MetaDBI):
         """ save meta into file """
         path = self.__meta_path(identifier=identifier)
         self.info(msg='Saving meta into: %s' % path)
-        return self.write_json(container=meta.dictionary, path=path)
+        return await self.write_json(container=meta.dictionary, path=path)
 
     # Override
     async def get_meta(self, identifier: ID) -> Optional[Meta]:
         """ load meta from file """
         path = self.__meta_path(identifier=identifier)
         self.info(msg='Loading meta from: %s' % path)
-        info = self.read_json(path=path)
+        info = await self.read_json(path=path)
         if info is not None:
             return Meta.parse(meta=info)

{dimples-1.2.1 → dimples-1.2.3}/dimples/database/dos/private.py

@@ -67,20 +67,20 @@ class PrivateKeyStorage(Storage, PrivateKeyDBI):
         path = self.private_path(self.msg_keys_path)
         return template_replace(path, key='ADDRESS', value=str(identifier.address))
 
-    def _save_id_key(self, key: PrivateKey, identifier: ID) -> bool:
+    async def _save_id_key(self, key: PrivateKey, identifier: ID) -> bool:
         path = self.__id_key_path(identifier=identifier)
         self.info(msg='Saving identity private key into: %s' % path)
-        return self.write_json(container=key.dictionary, path=path)
+        return await self.write_json(container=key.dictionary, path=path)
 
-    def _load_id_key(self, identifier: ID) -> Optional[PrivateKey]:
+    async def _load_id_key(self, identifier: ID) -> Optional[PrivateKey]:
         path = self.__id_key_path(identifier=identifier)
         self.info(msg='Loading identity private key from: %s' % path)
-        info = self.read_json(path=path)
+        info = await self.read_json(path=path)
         if info is not None:
             return PrivateKey.parse(key=info)
 
-    def _save_msg_key(self, key: PrivateKey, identifier: ID) -> bool:
-        private_keys = self._load_msg_keys(identifier=identifier)
+    async def _save_msg_key(self, key: PrivateKey, identifier: ID) -> bool:
+        private_keys = await self._load_msg_keys(identifier=identifier)
         private_keys = PrivateKeyDBI.insert(item=key, array=private_keys)
         if private_keys is None:
             # nothing changed
@@ -88,13 +88,13 @@ class PrivateKeyStorage(Storage, PrivateKeyDBI):
         plain = [item.dictionary for item in private_keys]
         path = self.__msg_keys_path(identifier=identifier)
         self.info(msg='Saving message private keys into: %s' % path)
-        return self.write_json(container=plain, path=path)
+        return await self.write_json(container=plain, path=path)
 
-    def _load_msg_keys(self, identifier: ID) -> List[PrivateKey]:
+    async def _load_msg_keys(self, identifier: ID) -> List[PrivateKey]:
         keys = []
         path = self.__msg_keys_path(identifier=identifier)
         self.info(msg='Loading message private keys from: %s' % path)
-        array = self.read_json(path=path)
+        array = await self.read_json(path=path)
         if array is not None:
             for item in array:
                 k = PrivateKey.parse(key=item)
@@ -110,17 +110,17 @@ class PrivateKeyStorage(Storage, PrivateKeyDBI):
     async def save_private_key(self, key: PrivateKey, user: ID, key_type: str = 'M') -> bool:
         if key_type == self.ID_KEY_TAG:
             # save private key for meta
-            return self._save_id_key(key=key, identifier=user)
+            return await self._save_id_key(key=key, identifier=user)
         else:
             # save private key for visa
-            return self._save_msg_key(key=key, identifier=user)
+            return await self._save_msg_key(key=key, identifier=user)
 
     # Override
     async def private_keys_for_decryption(self, user: ID) -> List[DecryptKey]:
-        keys: list = self._load_msg_keys(identifier=user)
+        keys: list = await self._load_msg_keys(identifier=user)
         # the 'ID key' could be used for encrypting message too (RSA),
         # so we append it to the decrypt keys here
-        id_key = self._load_id_key(identifier=user)
+        id_key = await self._load_id_key(identifier=user)
         if isinstance(id_key, DecryptKey) and PrivateKeyDBI.find(item=id_key, array=keys) < 0:
             keys.append(id_key)
         return keys
@@ -132,4 +132,4 @@ class PrivateKeyStorage(Storage, PrivateKeyDBI):
 
     # Override
     async def private_key_for_visa_signature(self, user: ID) -> Optional[SignKey]:
-        return self._load_id_key(identifier=user)
+        return await self._load_id_key(identifier=user)

{dimples-1.2.1 → dimples-1.2.3}/dimples/database/dos/station.py

@@ -67,17 +67,17 @@ class StationStorage(Storage, ProviderDBI, StationDBI):
         """ load providers from file """
         path = self.__providers_path()
         self.info(msg='Loading providers from: %s' % path)
-        providers = self.read_json(path=path)
+        providers = await self.read_json(path=path)
         if providers is None:
             # service providers not found
             return []
         return ProviderInfo.convert(array=providers)
 
-    def _save_providers(self, providers: List[ProviderInfo]) -> bool:
+    async def _save_providers(self, providers: List[ProviderInfo]) -> bool:
         """ save providers into file """
         path = self.__providers_path()
         self.info(msg='Saving providers into: %s' % path)
-        return self.write_json(container=ProviderInfo.revert(array=providers), path=path)
+        return await self.write_json(container=ProviderInfo.revert(array=providers), path=path)
 
     # Override
     async def add_provider(self, identifier: ID, chosen: int = 0) -> bool:
@@ -88,7 +88,7 @@ class StationStorage(Storage, ProviderDBI, StationDBI):
                 self.warning(msg='provider exists: %s, %s' % (identifier, providers))
                 return True
         providers.insert(0, ProviderInfo(identifier=identifier, chosen=chosen))
-        return self._save_providers(providers=providers)
+        return await self._save_providers(providers=providers)
 
     # Override
     async def update_provider(self, identifier: ID, chosen: int) -> bool:
@@ -107,7 +107,7 @@ class StationStorage(Storage, ProviderDBI, StationDBI):
             providers.insert(0, info)
         else:
             info.chosen = chosen
-        return self._save_providers(providers=providers)
+        return await self._save_providers(providers=providers)
 
     # Override
     async def remove_provider(self, identifier: ID) -> bool:
@@ -120,7 +120,7 @@ class StationStorage(Storage, ProviderDBI, StationDBI):
                 break
         if info is not None:
             providers.remove(info)
-            return self._save_providers(providers=providers)
+            return await self._save_providers(providers=providers)
 
     #
     #   Station DBI
@@ -131,17 +131,17 @@ class StationStorage(Storage, ProviderDBI, StationDBI):
         """ load stations with SP ID """
         path = self.__stations_path(provider=provider)
         self.info(msg='Loading stations from: %s' % path)
-        stations = self.read_json(path=path)
+        stations = await self.read_json(path=path)
         if stations is None:
             # stations not found
             return []
         return StationInfo.convert(array=stations)
 
-    def _save_stations(self, stations: List[StationInfo], provider: ID) -> bool:
+    async def _save_stations(self, stations: List[StationInfo], provider: ID) -> bool:
         """ save stations into file """
         path = self.__stations_path(provider=provider)
         self.info(msg='Saving stations into: %s' % path)
-        return self.write_json(container=StationInfo.revert(array=stations), path=path)
+        return await self.write_json(container=StationInfo.revert(array=stations), path=path)
 
     # Override
     async def add_station(self, identifier: Optional[ID], host: str, port: int, provider: ID, chosen: int = 0) -> bool:
@@ -152,7 +152,7 @@ class StationStorage(Storage, ProviderDBI, StationDBI):
                 self.warning(msg='station exists: %s, %d, %s' % (host, port, stations))
                 return True
         stations.insert(0, StationInfo(identifier=identifier, host=host, port=port, provider=provider, chosen=chosen))
-        return self._save_stations(stations=stations, provider=provider)
+        return await self._save_stations(stations=stations, provider=provider)
 
     # Override
     async def update_station(self, identifier: Optional[ID], host: str, port: int,
@@ -174,7 +174,7 @@ class StationStorage(Storage, ProviderDBI, StationDBI):
             if not (identifier is None or identifier.is_broadcast):
                 info.identifier = identifier
             info.chosen = chosen
-        return self._save_stations(stations=stations, provider=provider)
+        return await self._save_stations(stations=stations, provider=provider)
 
     # Override
     async def remove_station(self, host: str, port: int, provider: ID) -> bool:
@@ -187,7 +187,7 @@ class StationStorage(Storage, ProviderDBI, StationDBI):
                 break
         if info is not None:
             stations.remove(info)
-            return self._save_stations(stations=stations, provider=provider)
+            return await self._save_stations(stations=stations, provider=provider)
 
     # Override
     async def remove_stations(self, provider: ID) -> bool:
@@ -196,4 +196,4 @@ class StationStorage(Storage, ProviderDBI, StationDBI):
         if len(stations) == 0:
             # already empty
             return True
-        return self._save_stations(stations=[], provider=provider)
+        return await self._save_stations(stations=[], provider=provider)

{dimples-1.2.1 → dimples-1.2.3}/dimples/database/dos/user.py

@@ -71,7 +71,7 @@ class UserStorage(Storage, UserDBI, ContactDBI):
         """ load contacts from file """
         path = self.__contacts_path(identifier=user)
         self.info(msg='Loading contacts from: %s' % path)
-        contacts = self.read_json(path=path)
+        contacts = await self.read_json(path=path)
         if contacts is None:
             # contacts not found
             return []
@@ -82,4 +82,4 @@ class UserStorage(Storage, UserDBI, ContactDBI):
         """ save contacts into file """
         path = self.__contacts_path(identifier=user)
         self.info(msg='Saving contacts into: %s' % path)
-        return self.write_json(container=ID.revert(array=contacts), path=path)
+        return await self.write_json(container=ID.revert(array=contacts), path=path)

{dimples-1.2.1 → dimples-1.2.3}/dimples/database/t_meta.py

@@ -84,7 +84,7 @@ class MetaTable(MetaDBI):
     async def save_meta(self, meta: Meta, identifier: ID) -> bool:
         # assert Meta.match_id(meta=meta, identifier=identifier), 'meta invalid: %s, %s' % (identifier, meta)
         # 0. check old record
-        old = self.get_meta(identifier=identifier)
+        old = await self.get_meta(identifier=identifier)
         if old is not None:
             # meta exists, no need to update it
             return True

{dimples-1.2.1 → dimples-1.2.3}/dimples/edge/octopus.py

@@ -142,14 +142,6 @@ class Octopus(Runner, 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

{dimples-1.2.1 → dimples-1.2.3}/dimples/edge/shared.py

@@ -64,7 +64,7 @@ def show_help(cmd: str, app_name: str, default_config: str):
     print('')
 
 
-def create_config(app_name: str, default_config: str) -> Config:
+async def create_config(app_name: str, default_config: str) -> Config:
     """ Step 1: load config """
     cmd = sys.argv[0]
     try:
@@ -85,7 +85,7 @@ def create_config(app_name: str, default_config: str) -> Config:
     # check config filepath
     if ini_file is None:
         ini_file = default_config
-    if not Path.exists(path=ini_file):
+    if not await Path.exists(path=ini_file):
         show_help(cmd=cmd, app_name=app_name, default_config=default_config)
         print('')
         print('!!! config file not exists: %s' % ini_file)
@@ -110,14 +110,34 @@ async def create_database(config: Config) -> Tuple[AccountDBI, MessageDBI, Sessi
     adb.show_info()
     mdb.show_info()
     sdb.show_info()
-    # update neighbor stations (default provider)
+    #
+    #  Update neighbor stations (default provider)
+    #
     provider = ProviderInfo.GSP
     neighbors = config.neighbors
     if len(neighbors) > 0:
-        await sdb.remove_stations(provider=provider)
+        # await sdb.remove_stations(provider=provider)
+        # 1. remove vanished neighbors
+        old_stations = await sdb.all_stations(provider=provider)
+        for old in old_stations:
+            found = False
+            for item in neighbors:
+                if item.port == old.port and item.host == old.host:
+                    found = True
+                    break
+            if not found:
+                print('removing neighbor station: %s' % old)
+                await sdb.remove_station(host=old.host, port=old.port, provider=provider)
+        # 2. add new neighbors
         for node in neighbors:
-            print('adding neighbor node: %s' % node)
-            await sdb.add_station(identifier=None, host=node.host, port=node.port, provider=provider)
+            found = False
+            for old in old_stations:
+                if old.port == node.port and old.host == node.host:
+                    found = True
+                    break
+            if not found:
+                print('adding neighbor node: %s' % node)
+                await sdb.add_station(identifier=None, host=node.host, port=node.port, provider=provider)
     return adb, mdb, sdb
 
 

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

@@ -53,11 +53,11 @@ Log.LEVEL = Log.DEVELOP
 DEFAULT_CONFIG = '/etc/dim/edge.ini'
 
 
-async def main():
+async def async_main():
     # create global variable
     shared = GlobalVariable()
     # Step 1: load config
-    config = create_config(app_name='DIM Network Edge', default_config=DEFAULT_CONFIG)
+    config = await create_config(app_name='DIM Network Edge', default_config=DEFAULT_CONFIG)
     shared.config = config
     # Step 2: create database
     adb, mdb, sdb = await create_database(config=config)
@@ -79,5 +79,9 @@ async def main():
     Log.warning(msg='bot stopped: %s' % octopus)
 
 
+def main():
+    Runner.sync_run(main=async_main())
+
+
 if __name__ == '__main__':
-    Runner.sync_run(main=main())
+    main()

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

@@ -114,7 +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)
+            self.info(msg='"reset" command not found: %s' % content)
             return False
         return is_before(old_time=cmd.time, new_time=content.time)
 

{dimples-1.2.1 → dimples-1.2.3}/dimples/register/run.py

@@ -74,7 +74,7 @@ def show_help():
     print('')
 
 
-async def main():
+async def async_main():
     try:
         opts, args = getopt.getopt(args=sys.argv[1:],
                                    shortopts='hf:',
@@ -93,7 +93,7 @@ async def main():
     # check config filepath
     if ini_file is None:
         ini_file = DEFAULT_CONFIG
-    if not Path.exists(path=ini_file):
+    if not await Path.exists(path=ini_file):
         show_help()
         print('')
         print('!!! config file not exists: %s' % ini_file)
@@ -117,5 +117,9 @@ async def main():
         show_help()
 
 
+def main():
+    Runner.sync_run(main=async_main())
+
+
 if __name__ == '__main__':
-    Runner.sync_run(main=main())
+    main()

{dimples-1.2.1 → dimples-1.2.3}/dimples/server/archivist.py

@@ -142,8 +142,9 @@ class ServerArchivist(CommonArchivist, ABC):
         # dispatch
         dispatcher = get_dispatcher()
         neighbors = await self.all_neighbors
-        # avoid the new recipients redirect it to same targets
-        r_msg['recipients'] = ID.revert(neighbors)
+        self.info(msg='broadcast command "%s" to neighbors: %s' % (command.cmd, neighbors))
+        # # avoid the new recipients redirect it to same targets
+        # r_msg['recipients'] = ID.revert(neighbors)
         for receiver in neighbors:
             if receiver == sid:
                 self.debug(msg='skip cycled message: %s -> %s' % (sid, receiver))

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

@@ -310,14 +310,6 @@ class Roamer(Runner, 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.2.1 → dimples-1.2.3}/dimples/server/push.py

@@ -149,14 +149,6 @@ class PushCenter(Runner, 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