dimples 0.2.0__tar.gz → 0.2.2__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dimples
-Version: 0.2.0
+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.0 → dimples-0.2.2}/dimples/__init__.py

@@ -32,7 +32,6 @@ from mkm.protocol import *
 from dimp.mkm import *
 from dimp.dkd import *
 from dimsdk import *
-from dimsdk.cpu import *
 from dimplugins import *
 from dimplugins.network import NetworkType
 from dimplugins.entity import EntityID, EntityIDFactory

{dimples-0.2.0 → dimples-0.2.2}/dimples/client/__init__.py

@@ -48,7 +48,6 @@ __all__ = [
     #
     'HandshakeCommandProcessor',
     'LoginCommandProcessor',
-    'ReceiptCommandProcessor',
 
     #
     #   Client

{dimples-0.2.0 → dimples-0.2.2}/dimples/client/cpu/__init__.py

@@ -34,7 +34,6 @@ from .text import TextContentProcessor
 
 from .handshake import HandshakeCommandProcessor
 from .login import LoginCommandProcessor
-from .receipt import ReceiptCommandProcessor
 
 from .history import HistoryCommandProcessor, GroupCommandProcessor
 from .grp_invite import InviteCommandProcessor
@@ -44,14 +43,15 @@ from .grp_reset import ResetCommandProcessor
 from .grp_query import QueryCommandProcessor
 
 __all__ = [
+
     'TextContentProcessor',
 
     'HandshakeCommandProcessor',
     'LoginCommandProcessor',
-    'ReceiptCommandProcessor',
 
     'HistoryCommandProcessor',
     'GroupCommandProcessor',
     'InviteCommandProcessor', 'ExpelCommandProcessor', 'QuitCommandProcessor',
     'ResetCommandProcessor', 'QueryCommandProcessor',
+
 ]

{dimples-0.2.0 → 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.0 → 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.0 → 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.0 → 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.0 → 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.0 → 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.0 → dimples-0.2.2}/dimples/client/messenger.py

@@ -190,7 +190,7 @@ class ClientMessenger(CommonMessenger):
         responses = super().process_reliable_message(msg=msg)
         if len(responses) == 0 and self._needs_receipt(msg=msg):
             current_user = self.facebook.current_user
-            res = ReceiptCommand.create(text='Message received', msg=msg)
+            res = ReceiptCommand.create(text='Message received.', msg=msg)
             env = Envelope.create(sender=current_user.identifier, receiver=msg.sender)
             i_msg = InstantMessage.create(head=env, body=res)
             s_msg = self.encrypt_message(msg=i_msg)

{dimples-0.2.0 → dimples-0.2.2}/dimples/client/processor.py

@@ -31,24 +31,22 @@
 import time
 from typing import List, Optional, Union
 
-from dimp import EntityType
-from dimp import SecureMessage, ReliableMessage
-from dimp import ContentType, Content, TextContent
-from dimp import GroupCommand
-
+from dimsdk import EntityType
+from dimsdk import SecureMessage, ReliableMessage
+from dimsdk import ContentType, Content, TextContent
+from dimsdk import GroupCommand
+from dimsdk import ReceiptCommand
 from dimsdk import ContentProcessor, ContentProcessorCreator
 from dimsdk import MessageProcessor
-
-from dimsdk.cpu import BaseContentProcessor, BaseContentProcessorCreator
+from dimsdk import BaseContentProcessor, BaseContentProcessorCreator
 
 from ..utils import Logging
-from ..common import HandshakeCommand, ReceiptCommand, LoginCommand
+from ..common import HandshakeCommand, LoginCommand
 from ..common import CommonMessenger
 
 from .cpu import TextContentProcessor
 from .cpu import HandshakeCommandProcessor
 from .cpu import LoginCommandProcessor
-from .cpu import ReceiptCommandProcessor
 from .cpu import HistoryCommandProcessor, GroupCommandProcessor
 from .cpu import InviteCommandProcessor, ExpelCommandProcessor, QuitCommandProcessor
 from .cpu import ResetCommandProcessor, QueryCommandProcessor
@@ -121,7 +119,7 @@ class ClientContentProcessorCreator(BaseContentProcessorCreator):
     # Override
     def create_content_processor(self, msg_type: Union[int, ContentType]) -> Optional[ContentProcessor]:
         # text
-        if msg_type == ContentType.TEXT:
+        if msg_type == ContentType.TEXT.value:
             return TextContentProcessor(facebook=self.facebook, messenger=self.messenger)
         # history
         if msg_type == ContentType.HISTORY.value:
@@ -140,9 +138,6 @@ class ClientContentProcessorCreator(BaseContentProcessorCreator):
         # login
         if cmd == LoginCommand.LOGIN:
             return LoginCommandProcessor(facebook=self.facebook, messenger=self.messenger)
-        # receipt
-        if cmd == ReceiptCommand.RECEIPT:
-            return ReceiptCommandProcessor(facebook=self.facebook, messenger=self.messenger)
         # group commands
         if cmd == 'group':
             return GroupCommandProcessor(facebook=self.facebook, messenger=self.messenger)

{dimples-0.2.0 → dimples-0.2.2}/dimples/common/__init__.py

@@ -44,7 +44,6 @@ __all__ = [
     #   protocol
     #
     'HandshakeCommand', 'HandshakeState',
-    'ReceiptCommand',
     'LoginCommand',
     'ReportCommand',
     'AnsCommand',

{dimples-0.2.0 → dimples-0.2.2}/dimples/common/ans.py

@@ -111,6 +111,7 @@ class AddressNameServer(AddressNameService):
         count = 0
         self.__reserved['apns'] = False
         self.__reserved['master'] = False
+        self.__reserved['monitor'] = False
         self.__reserved['archivist'] = False
         self.__reserved['assistant'] = False
         # self.__reserved['station'] = False
@@ -125,6 +126,7 @@ class AddressNameServer(AddressNameService):
         # self.__reserved['station'] = True
         self.__reserved['assistant'] = True
         self.__reserved['archivist'] = True
+        self.__reserved['monitor'] = True
         self.__reserved['master'] = True
         self.__reserved['apns'] = True
         return count

{dimples-0.2.0 → dimples-0.2.2}/dimples/common/protocol/__init__.py

@@ -29,7 +29,6 @@ from dimsdk import register_all_factories as register_core_factories
 from dimplugins import register_plugins
 
 from .handshake import HandshakeCommand, HandshakeState
-from .receipt import ReceiptCommand
 from .login import LoginCommand
 from .report import ReportCommand
 from .ans import AnsCommand
@@ -41,8 +40,6 @@ def register_all_factories():
 
     # Handshake
     Command.register(cmd=HandshakeCommand.HANDSHAKE, factory=CommandFactoryBuilder(command_class=HandshakeCommand))
-    # Receipt
-    Command.register(cmd=ReceiptCommand.RECEIPT, factory=CommandFactoryBuilder(command_class=ReceiptCommand))
     # Login
     Command.register(cmd=LoginCommand.LOGIN, factory=CommandFactoryBuilder(command_class=LoginCommand))
     # Report
@@ -58,7 +55,6 @@ register_plugins()
 __all__ = [
 
     'HandshakeCommand', 'HandshakeState',
-    'ReceiptCommand',
     'LoginCommand',
     'ReportCommand',
     'AnsCommand',

{dimples-0.2.0 → dimples-0.2.2}/dimples/database/account.py

@@ -99,12 +99,14 @@ class AccountDatabase(AccountDBI):
 
     # Override
     def save_document(self, document: Document) -> bool:
-        # check with exists
+        # check meta first
         meta = self.__meta_table.meta(identifier=document.identifier)
         if meta is None:
             raise LookupError('meta not exists: %s' % document.identifier)
+        # check document valid before saving it
         if not (document.valid or document.verify(public_key=meta.key)):
             raise ValueError('document error: %s' % document.identifier)
+        # document ok, try to save it
         return self.__doc_table.save_document(document=document)
 
     # Override

{dimples-0.2.0 → dimples-0.2.2}/dimples/edge/shared.py

@@ -25,6 +25,7 @@
 
 import getopt
 import sys
+import time
 from typing import Optional, Tuple
 
 from dimsdk import ID, Station
@@ -131,7 +132,16 @@ def create_facebook(database: AccountDBI, current_user: ID) -> CommonFacebook:
     assert sign_key is not None, 'failed to get sign key for current user: %s' % current_user
     assert msg_keys is not None and len(msg_keys) > 0, 'failed to get msg keys: %s' % current_user
     print('set current user: %s' % current_user)
-    facebook.current_user = facebook.user(identifier=current_user)
+    user = facebook.user(identifier=current_user)
+    assert user is not None, 'failed to get current user: %s' % current_user
+    visa = user.visa
+    if visa is not None:
+        # refresh visa
+        now = time.time()
+        visa.set_property(key='time', value=now)
+        visa.sign(private_key=sign_key)
+        facebook.save_document(document=visa)
+    facebook.current_user = user
     return facebook
 
 

{dimples-0.2.0 → dimples-0.2.2}/dimples/server/__init__.py

@@ -58,7 +58,7 @@ __all__ = [
     #   CPU
     #
     'HandshakeCommandProcessor', 'LoginCommandProcessor', 'ReportCommandProcessor',
-    'AnsCommandProcessor', 'DocumentCommandProcessor', 'ReceiptCommandProcessor',
+    'AnsCommandProcessor', 'DocumentCommandProcessor',
 
     # Session
     'ServerSession', 'SessionCenter',  # 'SessionPool',

{dimples-0.2.0 → dimples-0.2.2}/dimples/server/cpu/__init__.py

@@ -37,10 +37,9 @@ from .ans import AnsCommandProcessor
 
 from .document import DocumentCommandProcessor
 
-from .receipt import ReceiptCommandProcessor
-
 
 __all__ = [
+
     'HandshakeCommandProcessor',
     'LoginCommandProcessor',
     'ReportCommandProcessor',
@@ -48,5 +47,4 @@ __all__ = [
 
     'DocumentCommandProcessor',
 
-    'ReceiptCommandProcessor',
 ]

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

@@ -48,9 +48,8 @@ class AnsCommandProcessor(BaseCommandProcessor):
     def process(self, content: Content, msg: ReliableMessage) -> List[Content]:
         assert isinstance(content, AnsCommand), 'report command error: %s' % content
         names = content.names
-        if names is None or len(names) == 0:
-            text = 'ANS command error'
-            return self._respond_text(text=text)
+        if len(names) == 0:
+            return self._respond_receipt(text='ANS command error.', msg=msg)
         records = {}
         missed = []
         for item in names:

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

@@ -54,8 +54,12 @@ class HandshakeCommandProcessor(BaseCommandProcessor):
         title = content.title
         if title in ['DIM?', 'DIM!']:
             # S -> C
-            text = 'Handshake command error: %s' % title
-            return self._respond_text(text=text)
+            return self._respond_receipt(text='Command not support.', msg=msg, extra={
+                'template': 'Handshake command error: title="${title}".',
+                'replacements': {
+                    'title': title,
+                }
+            })
         # C -> S: Hello world!
         assert 'Hello world!' == title, 'Handshake command error: %s' % content
         # set/update session in session server with new session key

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

@@ -86,7 +86,12 @@ 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.')
+        return self._respond_receipt(text='Login received.', msg=msg, extra={
+            'template': 'Login command received: ${ID}.',
+            'replacements': {
+                'ID': str(sender),
+            }
+        })
 
 
 def add_roaming(user: ID, station: ID):

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

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