dimp 2.3.3__tar.gz → 2.3.4__tar.gz

{dimp-2.3.3 → dimp-2.3.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dimp
-Version: 2.3.3
+Version: 2.3.4
 Summary: Decentralized Instant Messaging Protocol
 Home-page: https://github.com/dimchat/core-py
 Author: Albert Moky
@@ -18,7 +18,7 @@ License-File: LICENSE
 [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/dimchat/core-py/pulls)
 [![Platform](https://img.shields.io/badge/Platform-Python%203-brightgreen.svg)](https://github.com/dimchat/core-py/wiki)
 [![Issues](https://img.shields.io/github/issues/dimchat/core-py)](https://github.com/dimchat/core-py/issues)
-[![Repo Size](https://img.shields.io/github/repo-size/dimchat/core-py)](https://github.com/dimchat/core-py/archive/refs/heads/main.zip)
+[![Repo Size](https://img.shields.io/github/repo-size/dimchat/core-py)](https://github.com/dimchat/core-py/archive/refs/heads/master.zip)
 [![Tags](https://img.shields.io/github/tag/dimchat/core-py)](https://github.com/dimchat/core-py/tags)
 [![Version](https://img.shields.io/pypi/v/dimp)](https://pypi.org/project/dimp)
 
@@ -36,7 +36,7 @@ License-File: LICENSE
 
 ## Examples
 
-### extends Command
+### Extends Command
 
 * _Handshake Command Protocol_
   0. (C-S) handshake start
@@ -172,94 +172,48 @@ class BaseHandshakeCommand(BaseCommand, HandshakeCommand):
         return handshake_state(title=self.title, session=self.session)
 ```
 
-### extends Content
+### Extends Content
 
 ```python
-from abc import ABC, abstractmethod
 from typing import Any, Dict
 
-from dimp import ContentType
-from dimp import Content
-from dimp import BaseContent
+from dimp import *
 
 
-class AppContent(Content, ABC):
+class ApplicationContent(BaseContent, AppContent):
     """
         Application Customized message
         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
         data format: {
-            type : 0xA0,
+            type : i2s(0xA0),
             sn   : 123,
 
             app   : "{APP_ID}",  // application (e.g.: "chat.dim.sechat")
-            mod   : "{MODULE}",  // module name (e.g.: "drift_bottle")
-            act   : "{ACTION}",  // action name (e.g.: "throw")
             extra : info         // action parameters
         }
     """
 
-    @property
-    @abstractmethod
-    def application(self) -> str:
-        """ App ID """
-        raise NotImplemented
-
-    @property
-    @abstractmethod
-    def module(self) -> str:
-        """ Module Name """
-        raise NotImplemented
-
-    @property
-    @abstractmethod
-    def action(self) -> str:
-        """ Action Name """
-        raise NotImplemented
-
-    #
-    #   Factory
-    #
-    @classmethod
-    def create(cls, app: str, mod: str, act: str):
-        return ApplicationContent(app=app, mod=mod, act=act)
-
-
-class ApplicationContent(BaseContent, AppContent):
-
     def __init__(self, content: Dict[str, Any] = None,
-                 msg_type: str = None,
-                 app: str = None, mod: str = None, act: str = None):
+                 msg_type: str = None, app: str = None):
         if content is None:
-            # 1. new content with type, application, module & action
-            assert app is not None and mod is not None and act is not None, \
-                'customized content error: %s, %s, %s, %s' % (msg_type, app, mod, act)
+            # 1. new content with type, app_id
+            assert app is not None, 'customized content error: %s, %s' % (msg_type, app)
             if msg_type is None:
                 msg_type = ContentType.APPLICATION
             super().__init__(None, msg_type)
             self['app'] = app
-            self['mod'] = mod
-            self['act'] = act
         else:
             # 2. content info from network
-            assert msg_type is None and app is None and mod is None and act is None, \
-                'params error: %s, %s, %s, %s, %s' % (content, msg_type, app, mod, act)
+            assert msg_type is None and app is None, 'params error: %s, %s, %s' % (content, msg_type, app)
             super().__init__(content)
 
     @property  # Override
     def application(self) -> str:
         return self.get_str(key='app', default='')
-
-    @property  # Override
-    def module(self) -> str:
-        return self.get_str(key='mod', default='')
-
-    @property  # Override
-    def action(self) -> str:
-        return self.get_str(key='act', default='')
 ```
 
-### extends ID Address
+### Extends ID Address
 
 * Examples in [dim plugins](https://pypi.org/project/dimplugins)
 

{dimp-2.3.3 → dimp-2.3.4}/README.md

@@ -4,7 +4,7 @@
 [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/dimchat/core-py/pulls)
 [![Platform](https://img.shields.io/badge/Platform-Python%203-brightgreen.svg)](https://github.com/dimchat/core-py/wiki)
 [![Issues](https://img.shields.io/github/issues/dimchat/core-py)](https://github.com/dimchat/core-py/issues)
-[![Repo Size](https://img.shields.io/github/repo-size/dimchat/core-py)](https://github.com/dimchat/core-py/archive/refs/heads/main.zip)
+[![Repo Size](https://img.shields.io/github/repo-size/dimchat/core-py)](https://github.com/dimchat/core-py/archive/refs/heads/master.zip)
 [![Tags](https://img.shields.io/github/tag/dimchat/core-py)](https://github.com/dimchat/core-py/tags)
 [![Version](https://img.shields.io/pypi/v/dimp)](https://pypi.org/project/dimp)
 
@@ -22,7 +22,7 @@
 
 ## Examples
 
-### extends Command
+### Extends Command
 
 * _Handshake Command Protocol_
   0. (C-S) handshake start
@@ -158,94 +158,48 @@ class BaseHandshakeCommand(BaseCommand, HandshakeCommand):
         return handshake_state(title=self.title, session=self.session)
 ```
 
-### extends Content
+### Extends Content
 
 ```python
-from abc import ABC, abstractmethod
 from typing import Any, Dict
 
-from dimp import ContentType
-from dimp import Content
-from dimp import BaseContent
+from dimp import *
 
 
-class AppContent(Content, ABC):
+class ApplicationContent(BaseContent, AppContent):
     """
         Application Customized message
         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
         data format: {
-            type : 0xA0,
+            type : i2s(0xA0),
             sn   : 123,
 
             app   : "{APP_ID}",  // application (e.g.: "chat.dim.sechat")
-            mod   : "{MODULE}",  // module name (e.g.: "drift_bottle")
-            act   : "{ACTION}",  // action name (e.g.: "throw")
             extra : info         // action parameters
         }
     """
 
-    @property
-    @abstractmethod
-    def application(self) -> str:
-        """ App ID """
-        raise NotImplemented
-
-    @property
-    @abstractmethod
-    def module(self) -> str:
-        """ Module Name """
-        raise NotImplemented
-
-    @property
-    @abstractmethod
-    def action(self) -> str:
-        """ Action Name """
-        raise NotImplemented
-
-    #
-    #   Factory
-    #
-    @classmethod
-    def create(cls, app: str, mod: str, act: str):
-        return ApplicationContent(app=app, mod=mod, act=act)
-
-
-class ApplicationContent(BaseContent, AppContent):
-
     def __init__(self, content: Dict[str, Any] = None,
-                 msg_type: str = None,
-                 app: str = None, mod: str = None, act: str = None):
+                 msg_type: str = None, app: str = None):
         if content is None:
-            # 1. new content with type, application, module & action
-            assert app is not None and mod is not None and act is not None, \
-                'customized content error: %s, %s, %s, %s' % (msg_type, app, mod, act)
+            # 1. new content with type, app_id
+            assert app is not None, 'customized content error: %s, %s' % (msg_type, app)
             if msg_type is None:
                 msg_type = ContentType.APPLICATION
             super().__init__(None, msg_type)
             self['app'] = app
-            self['mod'] = mod
-            self['act'] = act
         else:
             # 2. content info from network
-            assert msg_type is None and app is None and mod is None and act is None, \
-                'params error: %s, %s, %s, %s, %s' % (content, msg_type, app, mod, act)
+            assert msg_type is None and app is None, 'params error: %s, %s, %s' % (content, msg_type, app)
             super().__init__(content)
 
     @property  # Override
     def application(self) -> str:
         return self.get_str(key='app', default='')
-
-    @property  # Override
-    def module(self) -> str:
-        return self.get_str(key='mod', default='')
-
-    @property  # Override
-    def action(self) -> str:
-        return self.get_str(key='act', default='')
 ```
 
-### extends ID Address
+### Extends ID Address
 
 * Examples in [dim plugins](https://pypi.org/project/dimplugins)
 

{dimp-2.3.3 → dimp-2.3.4}/dimp/__init__.py

@@ -65,7 +65,6 @@ __all__ = [
     'DataCoder', 'Hex', 'Base58', 'Base64',
     'ObjectCoder', 'JSON',
     'MapCoder', 'JSONMap',
-    'ListCoder', 'JSONList',
     'StringCoder', 'UTF8',
 
     'hex_encode', 'hex_decode',
@@ -81,10 +80,9 @@ __all__ = [
     #   Digest
     #
 
-    'DataDigester',
-    'MD5', 'SHA1', 'SHA256', 'KECCAK256', 'RIPEMD160',
-
-    'md5', 'sha1', 'sha256', 'keccak256', 'ripemd160',
+    'MessageDigester',
+    'SHA256', 'KECCAK256', 'RIPEMD160',
+    'sha256', 'keccak256', 'ripemd160',
 
     #
     #   Crypto
@@ -159,7 +157,7 @@ __all__ = [
 
     # group history
     'HistoryCommand', 'GroupCommand',
-    'InviteCommand', 'ExpelCommand', 'JoinCommand', 'QuitCommand', 'QueryCommand', 'ResetCommand',
+    'InviteCommand', 'ExpelCommand', 'JoinCommand', 'QuitCommand', 'ResetCommand',
     'HireCommand', 'FireCommand', 'ResignCommand',
 
     # extend contents
@@ -178,8 +176,8 @@ __all__ = [
 
     # extend group history
     'BaseHistoryCommand', 'BaseGroupCommand',
-    'InviteGroupCommand', 'ExpelGroupCommand', 'JoinGroupCommand',
-    'QuitGroupCommand', 'QueryGroupCommand', 'ResetGroupCommand',
+    'InviteGroupCommand', 'ExpelGroupCommand',
+    'JoinGroupCommand', 'QuitGroupCommand', 'ResetGroupCommand',
     'HireGroupCommand', 'FireGroupCommand', 'ResignGroupCommand',
 
     #

{dimp-2.3.3 → dimp-2.3.4}/dimp/crypto/__init__.py

@@ -42,12 +42,12 @@ from .pnf import BaseFileWrapper
 __all__ = [
 
     #
-    #   Data Digest
+    #   Digest
     #
 
-    'DataDigester',
-    'MD5', 'SHA1', 'SHA256', 'KECCAK256', 'RIPEMD160',
-    'md5', 'sha1', 'sha256', 'keccak256', 'ripemd160',
+    'MessageDigester',
+    'SHA256', 'KECCAK256', 'RIPEMD160',
+    'sha256', 'keccak256', 'ripemd160',
 
     #
     #   Crypto

{dimp-2.3.3 → dimp-2.3.4}/dimp/crypto/keys.py

@@ -34,7 +34,7 @@ from typing import Dict
 from mkm.types import Mapper, Dictionary
 from mkm.crypto import CryptographyKey, EncryptKey, DecryptKey, SignKey, VerifyKey
 from mkm.crypto import SymmetricKey, AsymmetricKey, PublicKey, PrivateKey
-from mkm.plugins import SharedCryptoExtensions
+from mkm.ext import SharedCryptoExtensions
 
 
 """
@@ -46,8 +46,8 @@ from mkm.plugins import SharedCryptoExtensions
 # noinspection PyAbstractClass
 class BaseKey(Dictionary, CryptographyKey, ABC):
 
-    def __init__(self, key: Dict):
-        super().__init__(dictionary=key)
+    # def __init__(self, key: Dict):
+    #     super().__init__(key)
 
     @property  # Override
     def algorithm(self) -> str:
@@ -97,8 +97,8 @@ class BaseKey(Dictionary, CryptographyKey, ABC):
 # noinspection PyAbstractClass
 class BaseSymmetricKey(Dictionary, SymmetricKey, ABC):
 
-    def __init__(self, key: Dict):
-        super().__init__(dictionary=key)
+    # def __init__(self, key: Dict):
+    #     super().__init__(key)
 
     # Override
     def __eq__(self, other) -> bool:
@@ -136,8 +136,8 @@ class BaseSymmetricKey(Dictionary, SymmetricKey, ABC):
 # noinspection PyAbstractClass
 class BaseAsymmetricKey(Dictionary, AsymmetricKey, ABC):
 
-    def __init__(self, key: Dict):
-        super().__init__(dictionary=key)
+    # def __init__(self, key: Dict):
+    #     super().__init__(key)
 
     @property  # Override
     def algorithm(self) -> str:
@@ -147,8 +147,8 @@ class BaseAsymmetricKey(Dictionary, AsymmetricKey, ABC):
 # noinspection PyAbstractClass
 class BasePublicKey(Dictionary, PublicKey, ABC):
 
-    def __init__(self, key: Dict):
-        super().__init__(dictionary=key)
+    # def __init__(self, key: Dict):
+    #     super().__init__(key)
 
     @property  # Override
     def algorithm(self) -> str:
@@ -162,8 +162,8 @@ class BasePublicKey(Dictionary, PublicKey, ABC):
 # noinspection PyAbstractClass
 class BasePrivateKey(Dictionary, PrivateKey, ABC):
 
-    def __init__(self, key: Dict):
-        super().__init__(dictionary=key)
+    # def __init__(self, key: Dict):
+    #     super().__init__(key)
 
     # Override
     def __eq__(self, other) -> bool:

{dimp-2.3.3 → dimp-2.3.4}/dimp/crypto/pnf.py

@@ -127,7 +127,7 @@ class BaseFileWrapper(Dictionary):
         if remote is None:
             self.pop('URL', None)
         else:
-            # convert URI to str
+            # TODO: convert URI to str
             self['URL'] = remote
         self.__url = remote
 

{dimp-2.3.3 → dimp-2.3.4}/dimp/dkd/__init__.py

@@ -35,17 +35,17 @@ from ..protocol.base import BaseContent
 from ..protocol.contents import BaseTextContent, WebPageContent, NameCardContent
 from ..protocol.forward import SecretContent, CombineForwardContent, ListContent
 from ..protocol.files import BaseFileContent, ImageFileContent, AudioFileContent, VideoFileContent
-from ..protocol.money import BaseMoneyContent, TransferMoneyContent
+from ..protocol.assets import BaseMoneyContent, TransferMoneyContent
 from ..protocol.quote import BaseQuoteContent
-from ..protocol.customized import AppCustomizedContent
+from ..protocol.app import AppCustomizedContent
 
 from ..protocol.base import BaseCommand
 from ..protocol.commands import BaseMetaCommand, BaseDocumentCommand
 from ..protocol.receipt import BaseReceiptCommand
 
 from ..protocol.groups import BaseHistoryCommand, BaseGroupCommand
-from ..protocol.groups import InviteGroupCommand, ExpelGroupCommand, JoinGroupCommand
-from ..protocol.groups import QuitGroupCommand, QueryGroupCommand, ResetGroupCommand
+from ..protocol.groups import InviteGroupCommand, ExpelGroupCommand
+from ..protocol.groups import JoinGroupCommand, QuitGroupCommand, ResetGroupCommand
 from ..protocol.groups import HireGroupCommand, FireGroupCommand, ResignGroupCommand
 
 # from ..protocol.base import CommandHelper
@@ -78,7 +78,7 @@ __all__ = [
 
     # group history
     'HistoryCommand', 'GroupCommand',
-    'InviteCommand', 'ExpelCommand', 'JoinCommand', 'QuitCommand', 'QueryCommand', 'ResetCommand',
+    'InviteCommand', 'ExpelCommand', 'JoinCommand', 'QuitCommand', 'ResetCommand',
     'HireCommand', 'FireCommand', 'ResignCommand',
 
     #
@@ -109,8 +109,8 @@ __all__ = [
 
     # group history
     'BaseHistoryCommand', 'BaseGroupCommand',
-    'InviteGroupCommand', 'ExpelGroupCommand', 'JoinGroupCommand',
-    'QuitGroupCommand', 'QueryGroupCommand', 'ResetGroupCommand',
+    'InviteGroupCommand', 'ExpelGroupCommand',
+    'JoinGroupCommand', 'QuitGroupCommand', 'ResetGroupCommand',
     'HireGroupCommand', 'FireGroupCommand', 'ResignGroupCommand',
 
     #

{dimp-2.3.3/dimp/plugins → dimp-2.3.4/dimp/ext}/__init__.py

@@ -28,8 +28,8 @@
 # SOFTWARE.
 # ==============================================================================
 
-from mkm.plugins import *
-from dkd.plugins import *
+from mkm.ext import *
+from dkd.ext import *
 
 from ..protocol.base import CommandHelper
 # from ..protocol.helpers import CommandExtensions

{dimp-2.3.3 → dimp-2.3.4}/dimp/mkm/meta.py

@@ -35,7 +35,7 @@ from mkm.format import utf8_encode
 from mkm.format import TransportableData
 from mkm.crypto import VerifyKey, PublicKey
 from mkm.types import Dictionary
-from mkm.plugins import SharedAccountExtensions
+from mkm.ext import SharedAccountExtensions
 from mkm import Meta
 
 

{dimp-2.3.3 → dimp-2.3.4}/dimp/msg/envelope.py

@@ -107,12 +107,12 @@ class MessageEnvelope(Dictionary, Envelope):
 
     @property  # Override
     def group(self) -> Optional[ID]:
-        identifier = self.get('group')
-        return ID.parse(identifier=identifier)
+        gid = self.get('group')
+        return ID.parse(identifier=gid)
 
     @group.setter  # Override
-    def group(self, value: ID):
-        self.set_string(key='group', value=value)
+    def group(self, gid: ID):
+        self.set_string(key='group', value=gid)
 
     @property  # Override
     def type(self) -> Optional[str]:

{dimp-2.3.3 → dimp-2.3.4}/dimp/protocol/__init__.py

@@ -50,16 +50,16 @@ from .docs import Visa, Bulletin
 from .contents import TextContent, PageContent, NameCard
 from .forward import ForwardContent, CombineContent, ArrayContent
 from .files import FileContent, ImageContent, AudioContent, VideoContent
-from .money import MoneyContent, TransferContent
+from .assets import MoneyContent, TransferContent
 from .quote import QuoteContent
-from .customized import CustomizedContent
+from .app import CustomizedContent
 
 from .base import Command, CommandFactory
 from .commands import MetaCommand, DocumentCommand
 from .receipt import ReceiptCommand
 
 from .groups import HistoryCommand, GroupCommand
-from .groups import InviteCommand, ExpelCommand, JoinCommand, QuitCommand, QueryCommand, ResetCommand
+from .groups import InviteCommand, ExpelCommand, JoinCommand, QuitCommand, ResetCommand
 from .groups import HireCommand, FireCommand, ResignCommand
 
 # from .base import CommandHelper, GeneralCommandHelper, SharedCommandExtensions
@@ -118,7 +118,7 @@ __all__ = [
 
     # group history
     'HistoryCommand', 'GroupCommand',
-    'InviteCommand', 'ExpelCommand', 'JoinCommand', 'QuitCommand', 'QueryCommand', 'ResetCommand',
+    'InviteCommand', 'ExpelCommand', 'JoinCommand', 'QuitCommand', 'ResetCommand',
     'HireCommand', 'FireCommand', 'ResignCommand',
 
     #

dimp-2.3.3/dimp/protocol/customized.py → dimp-2.3.4/dimp/protocol/app.py

@@ -37,18 +37,16 @@ from .types import ContentType
 from .base import BaseContent
 
 
-class CustomizedContent(Content, ABC):
+class AppContent(Content, ABC):
     """
-        Application Customized message
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+        Content for Application 0nly
+        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
         data format: {
-            type : i2s(0xCC),
+            type : i2s(0xA0),
             sn   : 123,
 
             app   : "{APP_ID}",  // application (e.g.: "chat.dim.sechat")
-            mod   : "{MODULE}",  // module name (e.g.: "drift_bottle")
-            act   : "{ACTION}",  // action name (e.g.: "throw")
             extra : info         // action parameters
         }
     """
@@ -59,6 +57,23 @@ class CustomizedContent(Content, ABC):
         """ App ID """
         raise NotImplemented
 
+
+class CustomizedContent(AppContent, ABC):
+    """
+        Application Customized message
+        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+        data format: {
+            type : i2s(0xCC),
+            sn   : 123,
+
+            app   : "{APP_ID}",  // application (e.g.: "chat.dim.sechat")
+            mod   : "{MODULE}",  // module name (e.g.: "drift_bottle")
+            act   : "{ACTION}",  // action name (e.g.: "throw")
+            extra : info         // action parameters
+        }
+    """
+
     @property
     @abstractmethod
     def module(self) -> str:
@@ -79,6 +94,13 @@ class CustomizedContent(Content, ABC):
         return AppCustomizedContent(app=app, mod=mod, act=act)
 
 
+###############################
+#                             #
+#   DaoKeDao Implementation   #
+#                             #
+###############################
+
+
 class AppCustomizedContent(BaseContent, CustomizedContent):
 
     def __init__(self, content: Dict = None,

{dimp-2.3.3 → dimp-2.3.4}/dimp/protocol/base.py

@@ -37,7 +37,7 @@ from mkm.types import Dictionary
 from mkm import ID
 from dkd import Content
 from dkd import InstantMessage
-from dkd.plugins import SharedMessageExtensions
+from dkd.ext import SharedMessageExtensions
 
 from .helpers import CommandExtensions
 from .types import ContentType

{dimp-2.3.3 → dimp-2.3.4}/dimp/protocol/commands.py

@@ -192,7 +192,6 @@ class BaseMetaCommand(BaseCommand, MetaCommand):
                 'params error: %s, %s, %s, %s' % (content, cmd, identifier, meta)
             super().__init__(content)
         # lazy load
-        self.__id = identifier
         self.__meta = meta
 
     #
@@ -200,9 +199,7 @@ class BaseMetaCommand(BaseCommand, MetaCommand):
     #
     @property  # Override
     def identifier(self) -> ID:
-        if self.__id is None:
-            self.__id = ID.parse(identifier=self.get('did'))
-        return self.__id
+        return ID.parse(identifier=self.get('did'))
 
     #
     #   Meta

{dimp-2.3.3 → dimp-2.3.4}/dimp/protocol/contents.py

@@ -369,14 +369,11 @@ class NameCardContent(BaseContent, NameCard):
                 'params error: %s, %s, %s, %s' % (content, identifier, name, avatar)
             super().__init__(content=content)
         # lazy load
-        self.__id = identifier
         self.__avatar = avatar
 
     @property  # Override
     def identifier(self) -> ID:
-        if self.__id is None:
-            self.__id = ID.parse(identifier=self.get('did'))
-        return self.__id
+        return ID.parse(identifier=self.get('did'))
 
     @property  # Override
     def name(self) -> str:

{dimp-2.3.3 → dimp-2.3.4}/dimp/protocol/groups.py

@@ -40,7 +40,6 @@
 from abc import ABC, abstractmethod
 from typing import Optional, List, Dict
 
-from mkm.types import DateTime
 from mkm import ID
 
 from .types import ContentType
@@ -81,7 +80,7 @@ class GroupCommand(HistoryCommand, ABC):
             sn   : 123,
 
             command : "reset",   // "invite", "quit", "query", ...
-            time    : 0,         // timestamp
+            time    : 123.456,   // command timestamp
 
             group   : "{GROUP_ID}",
             member  : "{MEMBER_ID}",
@@ -95,11 +94,11 @@ class GroupCommand(HistoryCommand, ABC):
     ABDICATE = "abdicate"
     # member
     INVITE = "invite"
-    EXPEL = "expel"  # Deprecated (use 'reset' instead)
+    EXPEL = "expel"    # Deprecated (use 'reset' instead)
     JOIN = "join"
     QUIT = "quit"
+    # QUERY = "query"  # Deprecated
     RESET = "reset"
-    QUERY = "query"  # (not history command)
     # administrator/assistant
     HIRE = "hire"
     FIRE = "fire"
@@ -158,10 +157,6 @@ class GroupCommand(HistoryCommand, ABC):
     def quit(cls, group: ID):
         return QuitGroupCommand(group=group)
 
-    @classmethod
-    def query(cls, group: ID, last_time: DateTime = None):
-        return QueryGroupCommand(group=group, last_time=last_time)
-
     @classmethod
     def reset(cls, group: ID, members: List[ID]):
         return ResetGroupCommand(group=group, members=members)
@@ -202,20 +197,6 @@ class QuitCommand(GroupCommand, ABC):
     pass
 
 
-class QueryCommand(GroupCommand, ABC):
-    """
-    NOTICE:
-        This command is just for querying group info,
-        should not be saved in group history
-    """
-
-    @property
-    @abstractmethod
-    def last_time(self) -> Optional[DateTime]:
-        """ Last group history time for querying """
-        raise NotImplemented
-
-
 # noinspection PyAbstractClass
 class ResetCommand(GroupCommand, ABC):
     pass
@@ -375,19 +356,6 @@ class QuitGroupCommand(BaseGroupCommand, QuitCommand):
         super().__init__(content, cmd=cmd, group=group)
 
 
-class QueryGroupCommand(BaseGroupCommand, QueryCommand):
-
-    def __init__(self, content: Dict = None, group: ID = None, last_time: DateTime = None):
-        cmd = GroupCommand.QUERY if content is None else None
-        super().__init__(content, cmd=cmd, group=group)
-        if last_time is not None:
-            self.set_datetime(key='last_time', value=last_time)
-
-    @property  # Override
-    def last_time(self) -> Optional[DateTime]:
-        return self.get_datetime(key='last_time')
-
-
 class ResetGroupCommand(BaseGroupCommand, ResetCommand):
 
     def __init__(self, content: Dict = None, group: ID = None, members: List[ID] = None):

{dimp-2.3.3 → dimp-2.3.4}/dimp.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dimp
-Version: 2.3.3
+Version: 2.3.4
 Summary: Decentralized Instant Messaging Protocol
 Home-page: https://github.com/dimchat/core-py
 Author: Albert Moky
@@ -18,7 +18,7 @@ License-File: LICENSE
 [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/dimchat/core-py/pulls)
 [![Platform](https://img.shields.io/badge/Platform-Python%203-brightgreen.svg)](https://github.com/dimchat/core-py/wiki)
 [![Issues](https://img.shields.io/github/issues/dimchat/core-py)](https://github.com/dimchat/core-py/issues)
-[![Repo Size](https://img.shields.io/github/repo-size/dimchat/core-py)](https://github.com/dimchat/core-py/archive/refs/heads/main.zip)
+[![Repo Size](https://img.shields.io/github/repo-size/dimchat/core-py)](https://github.com/dimchat/core-py/archive/refs/heads/master.zip)
 [![Tags](https://img.shields.io/github/tag/dimchat/core-py)](https://github.com/dimchat/core-py/tags)
 [![Version](https://img.shields.io/pypi/v/dimp)](https://pypi.org/project/dimp)
 
@@ -36,7 +36,7 @@ License-File: LICENSE
 
 ## Examples
 
-### extends Command
+### Extends Command
 
 * _Handshake Command Protocol_
   0. (C-S) handshake start
@@ -172,94 +172,48 @@ class BaseHandshakeCommand(BaseCommand, HandshakeCommand):
         return handshake_state(title=self.title, session=self.session)
 ```
 
-### extends Content
+### Extends Content
 
 ```python
-from abc import ABC, abstractmethod
 from typing import Any, Dict
 
-from dimp import ContentType
-from dimp import Content
-from dimp import BaseContent
+from dimp import *
 
 
-class AppContent(Content, ABC):
+class ApplicationContent(BaseContent, AppContent):
     """
         Application Customized message
         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
         data format: {
-            type : 0xA0,
+            type : i2s(0xA0),
             sn   : 123,
 
             app   : "{APP_ID}",  // application (e.g.: "chat.dim.sechat")
-            mod   : "{MODULE}",  // module name (e.g.: "drift_bottle")
-            act   : "{ACTION}",  // action name (e.g.: "throw")
             extra : info         // action parameters
         }
     """
 
-    @property
-    @abstractmethod
-    def application(self) -> str:
-        """ App ID """
-        raise NotImplemented
-
-    @property
-    @abstractmethod
-    def module(self) -> str:
-        """ Module Name """
-        raise NotImplemented
-
-    @property
-    @abstractmethod
-    def action(self) -> str:
-        """ Action Name """
-        raise NotImplemented
-
-    #
-    #   Factory
-    #
-    @classmethod
-    def create(cls, app: str, mod: str, act: str):
-        return ApplicationContent(app=app, mod=mod, act=act)
-
-
-class ApplicationContent(BaseContent, AppContent):
-
     def __init__(self, content: Dict[str, Any] = None,
-                 msg_type: str = None,
-                 app: str = None, mod: str = None, act: str = None):
+                 msg_type: str = None, app: str = None):
         if content is None:
-            # 1. new content with type, application, module & action
-            assert app is not None and mod is not None and act is not None, \
-                'customized content error: %s, %s, %s, %s' % (msg_type, app, mod, act)
+            # 1. new content with type, app_id
+            assert app is not None, 'customized content error: %s, %s' % (msg_type, app)
             if msg_type is None:
                 msg_type = ContentType.APPLICATION
             super().__init__(None, msg_type)
             self['app'] = app
-            self['mod'] = mod
-            self['act'] = act
         else:
             # 2. content info from network
-            assert msg_type is None and app is None and mod is None and act is None, \
-                'params error: %s, %s, %s, %s, %s' % (content, msg_type, app, mod, act)
+            assert msg_type is None and app is None, 'params error: %s, %s, %s' % (content, msg_type, app)
             super().__init__(content)
 
     @property  # Override
     def application(self) -> str:
         return self.get_str(key='app', default='')
-
-    @property  # Override
-    def module(self) -> str:
-        return self.get_str(key='mod', default='')
-
-    @property  # Override
-    def action(self) -> str:
-        return self.get_str(key='act', default='')
 ```
 
-### extends ID Address
+### Extends ID Address
 
 * Examples in [dim plugins](https://pypi.org/project/dimplugins)
 

{dimp-2.3.3 → dimp-2.3.4}/dimp.egg-info/SOURCES.txt

@@ -13,6 +13,7 @@ dimp/crypto/keys.py
 dimp/crypto/pnf.py
 dimp/crypto/ted.py
 dimp/dkd/__init__.py
+dimp/ext/__init__.py
 dimp/mkm/__init__.py
 dimp/mkm/docs.py
 dimp/mkm/document.py
@@ -23,18 +24,17 @@ dimp/msg/envelope.py
 dimp/msg/instant.py
 dimp/msg/reliable.py
 dimp/msg/secure.py
-dimp/plugins/__init__.py
 dimp/protocol/__init__.py
+dimp/protocol/app.py
+dimp/protocol/assets.py
 dimp/protocol/base.py
 dimp/protocol/commands.py
 dimp/protocol/contents.py
-dimp/protocol/customized.py
 dimp/protocol/docs.py
 dimp/protocol/files.py
 dimp/protocol/forward.py
 dimp/protocol/groups.py
 dimp/protocol/helpers.py
-dimp/protocol/money.py
 dimp/protocol/quote.py
 dimp/protocol/receipt.py
 dimp/protocol/types.py

dimp-2.3.4/dimp.egg-info/requires.txt

@@ -0,0 +1,2 @@
+dkd>=2.3.4
+mkm>=2.3.4

{dimp-2.3.3 → dimp-2.3.4}/setup.py

@@ -14,7 +14,7 @@ import io
 
 from setuptools import setup, find_packages
 
-__version__ = '2.3.3'
+__version__ = '2.3.4'
 __author__ = 'Albert Moky'
 __contact__ = 'albert.moky@gmail.com'
 
@@ -38,7 +38,7 @@ setup(
         'Operating System :: OS Independent',
     ],
     install_requires=[
-        'dkd>=2.3.3',
-        'mkm>=2.3.3',
+        'dkd>=2.3.4',
+        'mkm>=2.3.4',
     ]
 )

dimp-2.3.3/dimp.egg-info/requires.txt

@@ -1,2 +0,0 @@
-dkd>=2.3.3
-mkm>=2.3.3