dimples 1.3.4__tar.gz → 1.3.5__tar.gz

{dimples-1.3.4 → dimples-1.3.5}/PKG-INFO

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

{dimples-1.3.4 → dimples-1.3.5}/dimples/client/checker.py

@@ -71,7 +71,7 @@ class ClientChecker(EntityChecker, Logging):
             return False
         elif not self.is_meta_query_expired(identifier=identifier):
             # query not expired yet
-            self.info(msg='meta query not expired yet: %s' % identifier)
+            self.debug(msg='meta query not expired yet: %s' % identifier)
             return False
         self.info(msg='querying meta for: %s' % identifier)
         content = MetaCommand.query(identifier=identifier)
@@ -86,7 +86,7 @@ class ClientChecker(EntityChecker, Logging):
             return False
         elif not self.is_document_query_expired(identifier=identifier):
             # query not expired yet
-            self.info(msg='document query not expired yet: %s' % identifier)
+            self.debug(msg='document query not expired yet: %s' % identifier)
             return False
         last_time = self.get_last_document_time(identifier=identifier, documents=documents)
         self.info(msg='querying document for: %s, last time: %s' % (identifier, last_time))
@@ -103,7 +103,7 @@ class ClientChecker(EntityChecker, Logging):
             return False
         elif not self.is_members_query_expired(identifier=group):
             # query not expired yet
-            self.info('members query not expired yet: %s' % group)
+            self.debug('members query not expired yet: %s' % group)
             return False
         user = await facebook.current_user
         if user is None:

{dimples-1.3.4 → dimples-1.3.5}/dimples/client/terminal.py

@@ -240,14 +240,25 @@ class Terminal(Runner, DeviceMixin, Logging, StateDelegate, ABC):
     async def enter_state(self, state: SessionState, ctx: StateMachine, now: float):
         # called before state changed
         session = self.session
-        station = session.station
-        self.info(msg='enter state: %s, %s => %s' % (state, session.identifier, station.identifier))
+        if session is None:
+            sess_id = None
+            srv_id = None
+        else:
+            sess_id = session.identifier
+            station = session.station
+            if station is None:
+                srv_id = None
+            else:
+                srv_id = station.identifier
+        self.info(msg='enter state: %s, %s => %s' % (state, sess_id, srv_id))
 
     # Override
     async def exit_state(self, state: SessionState, ctx: StateMachine, now: float):
         # called after state changed
         current = ctx.current_state
-        self.info(msg='server state changed: %s -> %s, %s' % (state, current, self.session.station))
+        session = self.session
+        remote = None if session is None else session.remote_address
+        self.info(msg='server state changed: %s -> %s, %s' % (state, current, remote))
         index = current.index if isinstance(current, SessionState) else -1
         if index == -1 or index == StateOrder.ERROR:
             self.__last_time = 0
@@ -259,8 +270,6 @@ class Terminal(Runner, DeviceMixin, Logging, StateDelegate, ABC):
                 self.warning(msg='current user not set')
                 return
             self.info(msg='connect for user: %s' % user)
-            session = self.session
-            remote = None if session is None else session.remote_address
             if remote is None:
                 self.warning(msg='failed to get remote address: %s' % session)
                 return

{dimples-1.3.4 → dimples-1.3.5}/dimples/conn/gatekeeper.py

@@ -130,7 +130,7 @@ def reset_send_buffer_size(conn: Connection = None, sock: socket.socket = None)
             return False
         channel = conn.channel
         if not isinstance(channel, BaseChannel):
-            print('[SOCKET] channel error: %s, %s' % (channel, conn))
+            print('[SOCKET] channel error: %s, %s' % (channel, conn.remote_address))
             return False
         sock = channel.sock
         if sock is None:

{dimples-1.3.4 → dimples-1.3.5}/dimples/database/dos/document.py

@@ -26,15 +26,14 @@
 from typing import Optional, List
 
 from dimsdk import TransportableData
-from dimsdk import ID, Document, DocumentUtils
+from dimsdk import ID, Document
 
 from ...utils import template_replace
-from ...common import DocumentDBI
 
 from .base import Storage
 
 
-class DocumentStorage(Storage, DocumentDBI):
+class DocumentStorage(Storage):
     """
         Document for Entities (User/Group)
         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -72,40 +71,11 @@ class DocumentStorage(Storage, DocumentDBI):
         documents = []
         for info in array:
             doc = parse_document(dictionary=info, identifier=identifier)
-            assert doc is not None, 'document error: %s, %s' % (identifier, info)
-            documents.append(doc)
+            if doc is not None:
+                documents.append(doc)
         self.info(msg='Loaded %d documents from: %s' % (len(documents), path))
         return documents
 
-    #
-    #   Document DBI
-    #
-
-    # Override
-    async def save_document(self, document: Document) -> bool:
-        """ save document into file """
-        identifier = document.identifier
-        doc_type = document.type
-        # check old documents
-        all_documents = await self.get_documents(identifier=identifier)
-        old = DocumentUtils.last_document(all_documents, doc_type)
-        if old is None and doc_type == Document.VISA:
-            old = DocumentUtils.last_document(all_documents, 'profile')
-        if old is not None:
-            if DocumentUtils.is_expired(document, old):
-                self.warning(msg='drop expired document: %s' % identifier)
-                return False
-            all_documents.remove(old)
-        # append it
-        all_documents.append(document)
-        return await self.save_documents(documents=all_documents, identifier=identifier)
-
-    # Override
-    async def get_documents(self, identifier: ID) -> List[Document]:
-        """ load documents from file """
-        docs = await self.load_documents(identifier=identifier)
-        return [] if docs is None else docs
-
 
 def parse_document(dictionary: dict, identifier: ID = None, doc_type: str = '*') -> Optional[Document]:
     # check document ID

{dimples-1.3.4 → dimples-1.3.5}/dimples/database/dos/group_history.py

@@ -23,20 +23,18 @@
 # SOFTWARE.
 # ==============================================================================
 
-from typing import Optional, Tuple, List
+from typing import Tuple, List
 
 from dimsdk import ID
 from dimsdk import ReliableMessage
 from dimsdk import Command, GroupCommand
-from dimsdk import ResetCommand, ResignCommand
 
 from ...utils import template_replace
-from ...common import GroupHistoryDBI
 
 from .base import Storage
 
 
-class GroupHistoryStorage(Storage, GroupHistoryDBI):
+class GroupHistoryStorage(Storage):
     """
         Group History Command Storage
         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -89,69 +87,3 @@ class GroupHistoryStorage(Storage, GroupHistoryDBI):
         path = self.__history_path(group=group)
         self.info(msg='Saving %d group history(ies) into: %s' % (len(histories), path))
         return await self.write_json(container=array, path=path)
-
-    #
-    #   Group History DBI
-    #
-
-    # Override
-    async def save_group_history(self, group: ID, content: GroupCommand, message: ReliableMessage) -> bool:
-        histories = await self.load_group_histories(group=group)
-        item = (content, message)
-        histories.append(item)
-        return await self.save_group_histories(group=group, histories=histories)
-
-    # Override
-    async def get_group_histories(self, group: ID) -> List[Tuple[GroupCommand, ReliableMessage]]:
-        return await self.load_group_histories(group=group)
-
-    # Override
-    async def get_reset_command_message(self, group: ID) -> Tuple[Optional[ResetCommand], Optional[ReliableMessage]]:
-        histories = await self.load_group_histories(group=group)
-        pos = len(histories)
-        while pos > 0:
-            pos -= 1
-            his = histories[pos]
-            cmd = his[0]
-            msg = his[1]
-            if isinstance(cmd, ResetCommand):
-                return cmd, msg
-        return None, None
-
-    # Override
-    async def clear_group_member_histories(self, group: ID) -> bool:
-        histories = await self.load_group_histories(group=group)
-        if len(histories) == 0:
-            # history empty
-            return True
-        array = []
-        removed = 0
-        for his in histories:
-            if isinstance(his[0], ResignCommand):
-                # keep 'resign' command messages
-                array.append(his)
-            else:
-                # remove other command messages
-                removed += 1
-        # if nothing changed, return True
-        # else, save new histories
-        return removed == 0 or await self.save_group_histories(group=group, histories=array)
-
-    # Override
-    async def clear_group_admin_histories(self, group: ID) -> bool:
-        histories = await self.load_group_histories(group=group)
-        if len(histories) == 0:
-            # history empty
-            return True
-        array = []
-        removed = 0
-        for his in histories:
-            if isinstance(his[0], ResignCommand):
-                # remove 'resign' command messages
-                removed += 1
-            else:
-                # keep other command messages
-                array.append(his)
-        # if nothing changed, return True
-        # else, save new histories
-        return removed == 0 or await self.save_group_histories(group=group, histories=array)

{dimples-1.3.4 → dimples-1.3.5}/dimples/database/redis/document.py

@@ -56,7 +56,17 @@ class DocumentCache(Cache):
     def __cache_name(self, identifier: ID) -> str:
         return '%s.%s.%s' % (self.db_name, self.tbl_name, identifier)
 
-    async def get_documents(self, identifier: ID) -> Optional[List[Document]]:
+    async def save_documents(self, documents: List[Document], identifier: ID) -> bool:
+        array = []
+        for doc in documents:
+            assert doc.identifier == identifier, 'document ID not matched: %s, %s' % (identifier, doc)
+            array.append(doc.dictionary)
+        js = json_encode(obj=array)
+        value = utf8_encode(string=js)
+        name = self.__cache_name(identifier=identifier)
+        return await self.set(name=name, value=value, expires=self.EXPIRES)
+
+    async def load_documents(self, identifier: ID) -> Optional[List[Document]]:
         name = self.__cache_name(identifier=identifier)
         value = await self.get(name=name)
         if value is None:
@@ -79,13 +89,3 @@ class DocumentCache(Cache):
         else:
             assert info is None, 'document error: %s' % value
         return array
-
-    async def save_documents(self, documents: List[Document], identifier: ID) -> bool:
-        array = []
-        for doc in documents:
-            assert doc.identifier == identifier, 'document ID not matched: %s, %s' % (identifier, doc)
-            array.append(doc.dictionary)
-        js = json_encode(obj=array)
-        value = utf8_encode(string=js)
-        name = self.__cache_name(identifier=identifier)
-        return await self.set(name=name, value=value, expires=self.EXPIRES)

{dimples-1.3.4 → dimples-1.3.5}/dimples/database/t_document.py

@@ -63,7 +63,7 @@ class DocTask(DbTask):
     async def _load_redis_cache(self) -> Optional[List[Document]]:
         # 1. the redis server will return None when cache not found
         # 2. when redis server return an empty array, no need to check local storage again
-        return await self._redis.get_documents(identifier=self._identifier)
+        return await self._redis.load_documents(identifier=self._identifier)
 
     # Override
     async def _save_redis_cache(self, value: List[Document]) -> bool:
@@ -73,7 +73,7 @@ class DocTask(DbTask):
     async def _load_local_storage(self) -> Optional[List[Document]]:
         # 1. the local storage will return an empty array, when no document for this id
         # 2. return empty array as a placeholder for the memory cache
-        return await self._dos.get_documents(identifier=self._identifier)
+        return await self._dos.load_documents(identifier=self._identifier)
 
     # Override
     async def _save_local_storage(self, value: List[Document]) -> bool:

{dimples-1.3.4 → dimples-1.3.5}/dimples/database/t_group_history.py

@@ -75,7 +75,7 @@ class HisTask(DbTask):
     async def _load_local_storage(self) -> Optional[List[Tuple[GroupCommand, ReliableMessage]]]:
         # 1. the local storage will return an empty array, when no history in this group
         # 2. return empty array as a placeholder for the memory cache
-        return await self._dos.get_group_histories(group=self._group)
+        return await self._dos.load_group_histories(group=self._group)
 
     # Override
     async def _save_local_storage(self, value: List[Tuple[GroupCommand, ReliableMessage]]) -> bool:
@@ -101,14 +101,14 @@ class GroupHistoryTable(GroupHistoryDBI):
                        cache_pool=self._cache, redis=self._redis, storage=self._dos,
                        mutex_lock=self._lock)
 
-    async def load_group_histories(self, group: ID) -> List[Tuple[GroupCommand, ReliableMessage]]:
+    async def _load_group_histories(self, group: ID) -> List[Tuple[GroupCommand, ReliableMessage]]:
         task = self._new_task(group=group)
         histories = await task.load()
         if histories is None:
             histories = []
         return histories
 
-    async def save_group_histories(self, group: ID, histories: List[Tuple[GroupCommand, ReliableMessage]]) -> bool:
+    async def _save_group_histories(self, group: ID, histories: List[Tuple[GroupCommand, ReliableMessage]]) -> bool:
         task = self._new_task(group=group)
         return await task.save(value=histories)
 
@@ -119,17 +119,17 @@ class GroupHistoryTable(GroupHistoryDBI):
     # Override
     async def save_group_history(self, group: ID, content: GroupCommand, message: ReliableMessage) -> bool:
         item = (content, message)
-        histories = await self.load_group_histories(group=group)
+        histories = await self._load_group_histories(group=group)
         histories.append(item)
-        return await self.save_group_histories(group=group, histories=histories)
+        return await self._save_group_histories(group=group, histories=histories)
 
     # Override
     async def get_group_histories(self, group: ID) -> List[Tuple[GroupCommand, ReliableMessage]]:
-        return await self.load_group_histories(group=group)
+        return await self._load_group_histories(group=group)
 
     # Override
     async def get_reset_command_message(self, group: ID) -> Tuple[Optional[ResetCommand], Optional[ReliableMessage]]:
-        histories = await self.load_group_histories(group=group)
+        histories = await self._load_group_histories(group=group)
         pos = len(histories)
         while pos > 0:
             pos -= 1
@@ -142,7 +142,7 @@ class GroupHistoryTable(GroupHistoryDBI):
 
     # Override
     async def clear_group_member_histories(self, group: ID) -> bool:
-        histories = await self.load_group_histories(group=group)
+        histories = await self._load_group_histories(group=group)
         if len(histories) == 0:
             # history empty
             return True
@@ -157,11 +157,11 @@ class GroupHistoryTable(GroupHistoryDBI):
                 removed += 1
         # if nothing changed, return True
         # else, save new histories
-        return removed == 0 or await self.save_group_histories(group=group, histories=array)
+        return removed == 0 or await self._save_group_histories(group=group, histories=array)
 
     # Override
     async def clear_group_admin_histories(self, group: ID) -> bool:
-        histories = await self.load_group_histories(group=group)
+        histories = await self._load_group_histories(group=group)
         if len(histories) == 0:
             # history empty
             return True
@@ -176,4 +176,4 @@ class GroupHistoryTable(GroupHistoryDBI):
                 array.append(his)
         # if nothing changed, return True
         # else, save new histories
-        return removed == 0 or await self.save_group_histories(group=group, histories=array)
+        return removed == 0 or await self._save_group_histories(group=group, histories=array)

{dimples-1.3.4 → dimples-1.3.5}/dimples/edge/start.py

@@ -40,6 +40,7 @@ sys.path.insert(0, path)
 from dimples.utils import Log, Runner
 
 from dimples.client import ClientFacebook
+from dimples.client import ClientMessenger
 from dimples.client import ClientSession
 from dimples.client import Terminal
 
@@ -52,7 +53,7 @@ from dimples.edge.messenger import InnerMessenger, OuterMessenger
 class InnerClient(Terminal):
 
     # Override
-    def _create_messenger(self, facebook: ClientFacebook, session: ClientSession):
+    def _create_messenger(self, facebook: ClientFacebook, session: ClientSession) -> ClientMessenger:
         shared = GlobalVariable()
         messenger = InnerMessenger(session=session, facebook=facebook, database=shared.mdb)
         messenger.terminal = self  # Weak Reference
@@ -63,7 +64,7 @@ class InnerClient(Terminal):
 class OuterClient(Terminal):
 
     # Override
-    def _create_messenger(self, facebook: ClientFacebook, session: ClientSession):
+    def _create_messenger(self, facebook: ClientFacebook, session: ClientSession) -> ClientMessenger:
         shared = GlobalVariable()
         messenger = OuterMessenger(session=session, facebook=facebook, database=shared.mdb)
         messenger.terminal = self

{dimples-1.3.4 → dimples-1.3.5}/dimples.egg-info/PKG-INFO

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

{dimples-1.3.4 → dimples-1.3.5}/dimples.egg-info/requires.txt

@@ -3,4 +3,4 @@ dimsdk>=2.2.2
 startrek>=2.2.2
 tcp>=2.2.2
 udp>=2.2.2
-aiou>=0.3.0
+aiou>=1.0.0

{dimples-1.3.4 → dimples-1.3.5}/setup.py

@@ -14,7 +14,7 @@ import io
 
 from setuptools import setup, find_packages
 
-__version__ = '1.3.4'
+__version__ = '1.3.5'
 __author__ = 'Albert Moky'
 __contact__ = 'albert.moky@gmail.com'
 
@@ -62,6 +62,6 @@ setup(
         'tcp>=2.2.2',
         'udp>=2.2.2',
 
-        'aiou>=0.3.0',
+        'aiou>=1.0.0',
     ]
 )