dimples 0.2.1__tar.gz → 0.2.2__tar.gz

{dimples-0.2.1 → dimples-0.2.2}/PKG-INFO

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

{dimples-0.2.1 → dimples-0.2.2}/dimples/client/cpu/grp_expel.py

@@ -48,10 +48,6 @@ from .history import GroupCommandProcessor
 
 class ExpelCommandProcessor(GroupCommandProcessor):
 
-    STR_EXPEL_CMD_ERROR = 'Expel command error.'
-    STR_EXPEL_NOT_ALLOWED = 'Sorry, you are not allowed to expel member from this group.'
-    STR_CANNOT_EXPEL_OWNER = 'Group owner cannot be expelled.'
-
     # Override
     def process(self, content: Content, msg: ReliableMessage) -> List[Content]:
         assert isinstance(content, ExpelCommand), 'expel command error: %s' % content
@@ -61,25 +57,41 @@ class ExpelCommandProcessor(GroupCommandProcessor):
         members = facebook.members(identifier=group)
         # 0. check group
         if owner is None or members is None or len(members) == 0:
-            text = self.STR_GROUP_EMPTY
-            return self._respond_text(text=text, group=group)
+            return self._respond_receipt(text='Group empty.', msg=msg, group=group, extra={
+                'template': 'Group empty: ${ID}',
+                'replacements': {
+                    'ID': str(group),
+                }
+            })
         # 1. check permission
         sender = msg.sender
         if sender != owner:
             # not the owner? check assistants
             assistants = facebook.assistants(identifier=group)
             if assistants is None or sender not in assistants:
-                text = self.STR_EXPEL_NOT_ALLOWED
-                return self._respond_text(text=text, group=group)
+                return self._respond_receipt(text='Permission denied.', msg=msg, group=group, extra={
+                    'template': 'Not allowed to expel member from group: ${ID}',
+                    'replacements': {
+                        'ID': str(group),
+                    }
+                })
         # 2. expelling members
         expel_list = self.members(content=content)
         if expel_list is None or len(expel_list) == 0:
-            text = self.STR_EXPEL_CMD_ERROR
-            return self._respond_text(text=text, group=group)
+            return self._respond_receipt(text='Command error.', msg=msg, group=group, extra={
+                'template': 'Expel list is empty: ${ID}',
+                'replacements': {
+                    'ID': str(group),
+                }
+            })
         # 2.1. check owner
         if owner in expel_list:
-            text = self.STR_CANNOT_EXPEL_OWNER
-            return self._respond_text(text=text, group=group)
+            return self._respond_receipt(text='Permission denied.', msg=msg, group=group, extra={
+                'template': 'Not allowed to expel owner of group: ${ID}',
+                'replacements': {
+                    'ID': str(group),
+                }
+            })
         # 2.2. build removed-list
         remove_list = []
         for item in expel_list:

{dimples-0.2.1 → dimples-0.2.2}/dimples/client/cpu/grp_invite.py

@@ -48,9 +48,6 @@ from .grp_reset import ResetCommandProcessor
 
 class InviteCommandProcessor(ResetCommandProcessor):
 
-    STR_INVITE_CMD_ERROR = 'Invite command error.'
-    STR_INVITE_NOT_ALLOWED = 'Sorry, you are not allowed to invite new members into this group.'
-
     # Override
     def process(self, content: Content, msg: ReliableMessage) -> List[Content]:
         assert isinstance(content, InviteCommand), 'invite command error: %s' % content
@@ -62,25 +59,33 @@ class InviteCommandProcessor(ResetCommandProcessor):
         if owner is None or members is None or len(members) == 0:
             # NOTICE: group membership lost?
             #         reset group members
-            return self._temporary_save(content=content, sender=msg.sender)
+            return self._temporary_save(content=content, sender=msg.sender, msg=msg)
         # 1. check permission
         sender = msg.sender
         if sender not in members:
             # not a member? check assistants
             assistants = facebook.assistants(identifier=group)
             if assistants is None or sender not in assistants:
-                text = self.STR_INVITE_NOT_ALLOWED
-                return self._respond_text(text=text, group=group)
+                return self._respond_receipt(text='Permission denied.', msg=msg, group=group, extra={
+                    'template': 'Not allowed to invite member into group: ${ID}',
+                    'replacements': {
+                        'ID': str(group),
+                    }
+                })
         # 2. inviting members
         invite_list = self.members(content=content)
         if invite_list is None or len(invite_list) == 0:
-            text = self.STR_INVITE_CMD_ERROR
-            return self._respond_text(text=text, group=group)
+            return self._respond_receipt(text='Command error.', msg=msg, group=group, extra={
+                'template': 'Invite list is empty: ${ID}',
+                'replacements': {
+                    'ID': str(group),
+                }
+            })
         # 2.1. check for reset
         if sender == owner and owner in invite_list:
             # NOTICE: owner invites owner?
             #         it means this should be a 'reset' command
-            return self._temporary_save(content=content, sender=sender)
+            return self._temporary_save(content=content, sender=sender, msg=msg)
         # 2.2. build invited-list
         add_list = []
         for item in invite_list:

{dimples-0.2.1 → dimples-0.2.2}/dimples/client/cpu/grp_query.py

@@ -50,8 +50,6 @@ from .history import GroupCommandProcessor
 
 class QueryCommandProcessor(GroupCommandProcessor):
 
-    STR_QUERY_NOT_ALLOWED = 'Sorry, you are not allowed to query this group.'
-
     def _respond_group_members(self, owner: ID, group: ID, members: List[ID]) -> Content:
         facebook = self.facebook
         assert isinstance(facebook, CommonFacebook), 'facebook error: %s' % facebook
@@ -71,16 +69,24 @@ class QueryCommandProcessor(GroupCommandProcessor):
         members = facebook.members(identifier=group)
         # 0. check group
         if owner is None or members is None or len(members) == 0:
-            text = self.STR_GROUP_EMPTY
-            return self._respond_text(text=text, group=group)
+            return self._respond_receipt(text='Group empty.', msg=msg, group=group, extra={
+                'template': 'Group empty: ${ID}',
+                'replacements': {
+                    'ID': str(group),
+                }
+            })
         # 1. check permission
         sender = msg.sender
         if sender not in members:
             # not a member? check assistants
             assistants = facebook.assistants(identifier=group)
             if assistants is None or sender not in assistants:
-                text = self.STR_QUERY_NOT_ALLOWED
-                return self._respond_text(text=text, group=group)
+                return self._respond_receipt(text='Permission denied.', msg=msg, group=group, extra={
+                    'template': 'Not allowed to query members of group: ${ID}',
+                    'replacements': {
+                        'ID': str(group),
+                    }
+                })
         # 2. respond
         res = self._respond_group_members(owner=owner, group=group, members=members)
         return [] if res is None else [res]

{dimples-0.2.1 → dimples-0.2.2}/dimples/client/cpu/grp_quit.py

@@ -39,6 +39,7 @@
 
 from typing import List
 
+from dimp import ID
 from dimp import ReliableMessage
 from dimp import Content
 from dimp import QuitCommand
@@ -48,14 +49,16 @@ from .history import GroupCommandProcessor
 
 class QuitCommandProcessor(GroupCommandProcessor):
 
-    STR_OWNER_CANNOT_QUIT = 'Sorry, owner cannot quit.'
-    STR_ASSISTANT_CANNOT_QUIT = 'Sorry, assistant cannot quit.'
-
     # noinspection PyUnusedLocal
-    def _remove_assistant(self, content: QuitCommand, msg: ReliableMessage) -> List[Content]:
+    def _remove_assistant(self, content: QuitCommand, sender: ID, msg: ReliableMessage) -> List[Content]:
         # NOTICE: group assistant should be retired by the owner
-        text = self.STR_ASSISTANT_CANNOT_QUIT
-        return self._respond_text(text=text, group=content.group)
+        group = content.group
+        return self._respond_receipt(text='Permission denied.', msg=msg, group=group, extra={
+            'template': 'Assistant cannot quit from group: ${ID}',
+            'replacements': {
+                'ID': str(group),
+            }
+        })
 
     # Override
     def process(self, content: Content, msg: ReliableMessage) -> List[Content]:
@@ -66,16 +69,24 @@ class QuitCommandProcessor(GroupCommandProcessor):
         members = facebook.members(identifier=group)
         # 0. check group
         if owner is None or members is None or len(members) == 0:
-            text = self.STR_GROUP_EMPTY
-            return self._respond_text(text=text, group=group)
+            return self._respond_receipt(text='Group empty.', msg=msg, group=group, extra={
+                'template': 'Group empty: ${ID}',
+                'replacements': {
+                    'ID': str(group),
+                }
+            })
         # 1. check permission
         sender = msg.sender
         if sender == owner:
-            text = self.STR_OWNER_CANNOT_QUIT
-            return self._respond_text(text=text, group=group)
+            return self._respond_receipt(text='Permission denied.', msg=msg, group=group, extra={
+                'template': 'Owner cannot quit from group: ${ID}',
+                'replacements': {
+                    'ID': str(group),
+                }
+            })
         assistants = facebook.assistants(identifier=group)
         if assistants is not None and sender in assistants:
-            return self._remove_assistant(content=content, msg=msg)
+            return self._remove_assistant(content=content, sender=sender, msg=msg)
         # 2. remove sender from group members
         if sender in members:
             members.remove(sender)

{dimples-0.2.1 → dimples-0.2.2}/dimples/client/cpu/grp_reset.py

@@ -55,23 +55,24 @@ from .history import GroupCommandProcessor
 
 class ResetCommandProcessor(GroupCommandProcessor):
 
-    STR_RESET_CMD_ERROR = 'Reset command error.'
-    STR_RESET_NOT_ALLOWED = 'Sorry, you are not allowed to reset this group.'
-
     def _query_owner(self, owner: ID, group: ID):
         command = GroupCommand.query(group=group)
         messenger = self.messenger
         assert isinstance(messenger, CommonMessenger), 'messenger error: %s' % messenger
         messenger.send_content(sender=None, receiver=owner, content=command, priority=1)
 
-    def _temporary_save(self, content: GroupCommand, sender: ID) -> List[Content]:
+    def _temporary_save(self, content: GroupCommand, sender: ID, msg: ReliableMessage) -> List[Content]:
         facebook = self.facebook
         group = content.group
         # check whether the owner contained in the new members
         new_members = self.members(content=content)
         if new_members is None or len(new_members) == 0:
-            text = self.STR_RESET_CMD_ERROR
-            return self._respond_text(text=text, group=group)
+            return self._respond_receipt(text='Command error.', msg=msg, group=group, extra={
+                'template': 'New member list is empty: ${ID}',
+                'replacements': {
+                    'ID': str(group),
+                }
+            })
         man = group_manager()
         for item in new_members:
             if facebook.meta(identifier=item) is None:
@@ -106,24 +107,36 @@ class ResetCommandProcessor(GroupCommandProcessor):
         if owner is None or members is None or len(members) == 0:
             # FIXME: group profile lost?
             # FIXME: how to avoid strangers impersonating group members?
-            return self._temporary_save(content=content, sender=msg.sender)
+            return self._temporary_save(content=content, sender=msg.sender, msg=msg)
         # 1. check permission
         sender = msg.sender
         if sender != owner:
             # not the owner? check assistants
             assistants = facebook.assistants(identifier=group)
             if assistants is None or sender not in assistants:
-                text = self.STR_RESET_NOT_ALLOWED
-                return self._respond_text(text=text, group=group)
+                return self._respond_receipt(text='Permission denied.', msg=msg, group=group, extra={
+                    'template': 'Not allowed to reset members of group: ${ID}',
+                    'replacements': {
+                        'ID': str(group),
+                    }
+                })
         # 2. resetting members
         new_members = self.members(content=content)
         if new_members is None or len(new_members) == 0:
-            text = self.STR_RESET_CMD_ERROR
-            return self._respond_text(text=text, group=group)
+            return self._respond_receipt(text='Command error.', msg=msg, group=group, extra={
+                'template': 'New member list is empty: ${ID}',
+                'replacements': {
+                    'ID': str(group),
+                }
+            })
         # 2.1. check owner
         if owner not in new_members:
-            text = self.STR_RESET_CMD_ERROR
-            return self._respond_text(text=text, group=group)
+            return self._respond_receipt(text='Permission denied.', msg=msg, group=group, extra={
+                'template': 'Owner not in the new member list of group: ${ID}',
+                'replacements': {
+                    'ID': str(group),
+                }
+            })
         # 2.2. build expelled-list
         remove_list = []
         for item in members:

{dimples-0.2.1 → dimples-0.2.2}/dimples/client/cpu/history.py

@@ -45,20 +45,19 @@ from dimsdk.cpu import BaseCommandProcessor
 
 class HistoryCommandProcessor(BaseCommandProcessor):
 
-    FMT_HIS_CMD_NOT_SUPPORT = 'History command (name: %s) not support yet!'
-
     # Override
     def process(self, content: Content, msg: ReliableMessage) -> List[Content]:
         assert isinstance(content, Command), 'history command error: %s' % content
-        text = self.FMT_HIS_CMD_NOT_SUPPORT % content.cmd
-        return self._respond_text(text=text, group=content.group)
+        return self._respond_receipt(text='Command not support.', msg=msg, group=content.group, extra={
+            'template': 'History command (name: ${command}) not support yet!',
+            'replacements': {
+                'command': content.cmd,
+            }
+        })
 
 
 class GroupCommandProcessor(HistoryCommandProcessor):
 
-    FMT_GRP_CMD_NOT_SUPPORT = 'Group command (name: %s) not support yet!'
-    STR_GROUP_EMPTY = 'Group empty.'
-
     @staticmethod
     def members(content: GroupCommand) -> List[ID]:
         # get from 'members'
@@ -75,5 +74,9 @@ class GroupCommandProcessor(HistoryCommandProcessor):
     # Override
     def process(self, content: Content, msg: ReliableMessage) -> List[Content]:
         assert isinstance(content, GroupCommand), 'group command error: %s' % content
-        text = self.FMT_GRP_CMD_NOT_SUPPORT % content.cmd
-        return self._respond_text(text=text, group=content.group)
+        return self._respond_receipt(text='Command not support.', msg=msg, group=content.group, extra={
+            'template': 'Group command (name: ${command}) not support yet!',
+            'replacements': {
+                'command': content.cmd,
+            }
+        })

{dimples-0.2.1 → dimples-0.2.2}/dimples/server/cpu/ans.py

@@ -49,8 +49,7 @@ class AnsCommandProcessor(BaseCommandProcessor):
         assert isinstance(content, AnsCommand), 'report command error: %s' % content
         names = content.names
         if len(names) == 0:
-            text = 'ANS command error.'
-            return self._respond_text(text=text)
+            return self._respond_receipt(text='ANS command error.', msg=msg)
         records = {}
         missed = []
         for item in names:

{dimples-0.2.1 → dimples-0.2.2}/dimples/server/cpu/handshake.py

@@ -54,7 +54,7 @@ class HandshakeCommandProcessor(BaseCommandProcessor):
         title = content.title
         if title in ['DIM?', 'DIM!']:
             # S -> C
-            return self._respond_text(text='Command not support.', extra={
+            return self._respond_receipt(text='Command not support.', msg=msg, extra={
                 'template': 'Handshake command error: title="${title}".',
                 'replacements': {
                     'title': title,

{dimples-0.2.1 → dimples-0.2.2}/dimples/server/cpu/login.py

@@ -86,7 +86,7 @@ class LoginCommandProcessor(BaseCommandProcessor, Logging):
         session.set_active(active=True)
         # only respond the user login to this station
         self.info(msg='user login: %s -> %s' % (sender, roaming))
-        return self._respond_text(text='Login received.', extra={
+        return self._respond_receipt(text='Login received.', msg=msg, extra={
             'template': 'Login command received: ${ID}.',
             'replacements': {
                 'ID': str(sender),

{dimples-0.2.1 → dimples-0.2.2}/dimples/server/cpu/report.py

@@ -65,7 +65,7 @@ class ReportCommandProcessor(BaseCommandProcessor, Logging):
         if title == ReportCommand.ONLINE:
             # online
             session.set_active(active=True, when=content.time)
-            return self._respond_text(text='Online received.', extra={
+            return self._respond_receipt(text='Online received.', msg=msg, extra={
                 'template': 'Online command received: ${ID}.',
                 'replacements': {
                     'ID': str(sender),
@@ -74,14 +74,10 @@ class ReportCommandProcessor(BaseCommandProcessor, Logging):
         elif title == ReportCommand.OFFLINE:
             # offline
             session.set_active(active=False, when=content.time)
-            return self._respond_text(text='Offline received.', extra={
-                'template': 'Offline command received: ${ID}.',
-                'replacements': {
-                    'ID': str(sender),
-                }
-            })
+            # respond nothing when user offline
+            return []
         else:
-            return self._respond_text(text='Command not support.', extra={
+            return self._respond_receipt(text='Command not support.', msg=msg, extra={
                 'template': 'Report command (title: ${title}) not support yet!',
                 'replacements': {
                     'title': title,

{dimples-0.2.1 → dimples-0.2.2}/dimples/server/processor.py

@@ -69,7 +69,7 @@ class ServerMessageProcessor(MessageProcessor, Logging):
         sender = r_msg.sender
         # 1. check login
         session = messenger.session
-        if session.identifier is None or not session.active:
+        if session.identifier is None:  # or not session.active:
             # not login yet, force to handshake again
             if not isinstance(content, HandshakeCommand):
                 handshake = HandshakeCommand.ask(session=session.key)

{dimples-0.2.1 → dimples-0.2.2}/dimples/server/session.py

@@ -99,7 +99,8 @@ class ServerSession(BaseSession):
     def set_active(self, active: bool, when: float = None):
         if super().set_active(active=active, when=when):
             session_change_active(session=self, active=active)
-            load_cached_messages(session=self)
+            if active:
+                load_cached_messages(session=self)
             return True
 
     @property  # Override

{dimples-0.2.1 → dimples-0.2.2}/dimples.egg-info/PKG-INFO

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

{dimples-0.2.1 → dimples-0.2.2}/dimples.egg-info/requires.txt

@@ -1,5 +1,5 @@
 dimplugins>=0.1.4
-dimsdk>=0.8.6
+dimsdk>=0.8.7
 dimp>=0.12.9
 dkd>=0.12.7
 mkm>=0.12.7

{dimples-0.2.1 → dimples-0.2.2}/setup.py

@@ -14,7 +14,7 @@ import io
 
 from setuptools import setup, find_packages
 
-__version__ = '0.2.1'
+__version__ = '0.2.2'
 __author__ = 'Albert Moky'
 __contact__ = 'albert.moky@gmail.com'
 
@@ -53,7 +53,7 @@ setup(
         # 'ecdsa',   # 0.16.1
         'dimplugins>=0.1.4',
 
-        'dimsdk>=0.8.6',
+        'dimsdk>=0.8.7',
         'dimp>=0.12.9',
         'dkd>=0.12.7',
         'mkm>=0.12.7',