dimp 2.0.0__tar.gz → 2.1.0__tar.gz

{dimp-2.0.0 → dimp-2.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dimp
-Version: 2.0.0
+Version: 2.1.0
 Summary: Decentralized Instant Messaging Protocol
 Home-page: https://github.com/dimchat/core-py
 Author: Albert Moky

{dimp-2.0.0 → dimp-2.1.0}/dimp/__init__.py

@@ -112,7 +112,7 @@ __all__ = [
 
     'Command', 'CommandFactory',
     'MetaCommand', 'DocumentCommand',
-    'ReceiptCommand', 'ReceiptCommandMixIn',
+    'ReceiptCommand',
 
     'HistoryCommand', 'GroupCommand',
     'InviteCommand', 'ExpelCommand', 'JoinCommand', 'QuitCommand', 'QueryCommand', 'ResetCommand',
@@ -127,7 +127,7 @@ __all__ = [
 
     'BaseCommand',
     'BaseMetaCommand', 'BaseDocumentCommand',
-    'BaseReceipt', 'BaseReceiptCommand',
+    'BaseReceiptCommand',
 
     'BaseHistoryCommand', 'BaseGroupCommand',
     'InviteGroupCommand', 'ExpelGroupCommand', 'JoinGroupCommand',

{dimp-2.0.0 → dimp-2.1.0}/dimp/dkd/__init__.py

@@ -39,7 +39,7 @@ from .money import BaseMoneyContent, TransferMoneyContent
 from .customized import AppCustomizedContent
 
 from .commands import BaseMetaCommand, BaseDocumentCommand
-from .receipt import BaseReceipt, BaseReceiptCommand
+from .receipt import BaseReceiptCommand
 
 from .groups import BaseHistoryCommand, BaseGroupCommand
 from .groups import InviteGroupCommand, ExpelGroupCommand, JoinGroupCommand
@@ -72,7 +72,7 @@ __all__ = [
 
     'Command', 'CommandFactory',
     'MetaCommand', 'DocumentCommand',
-    'ReceiptCommand', 'ReceiptCommandMixIn',
+    'ReceiptCommand',
 
     'HistoryCommand', 'GroupCommand',
     'InviteCommand', 'ExpelCommand', 'JoinCommand', 'QuitCommand', 'QueryCommand', 'ResetCommand',
@@ -93,7 +93,7 @@ __all__ = [
     #
     'BaseCommand',
     'BaseMetaCommand', 'BaseDocumentCommand',
-    'BaseReceipt', 'BaseReceiptCommand',
+    'BaseReceiptCommand',
 
     'BaseHistoryCommand', 'BaseGroupCommand',
     'InviteGroupCommand', 'ExpelGroupCommand', 'JoinGroupCommand',

{dimp-2.0.0 → dimp-2.1.0}/dimp/dkd/contents.py

@@ -199,7 +199,7 @@ class WebPageContent(BaseContent, PageContent):
 
     def __init__(self, content: Dict[str, Any] = None,
                  url: URI = None, html: str = None, title: str = None,
-                 desc: Optional[str] = None, icon: Optional[URI] = None):
+                 desc: Optional[str] = None, icon: Optional[PortableNetworkFile] = None):
         if content is None:
             # 1. new content with url, title, desc & icon
             assert url is not None and title is not None, 'page info error: %s, %s, %s, %s' % (url, title, desc, icon)
@@ -208,6 +208,7 @@ class WebPageContent(BaseContent, PageContent):
         else:
             # 2. content info from network
             super().__init__(content)
+        self.__icon = None
         # URL or HTML
         if url is not None:
             self.url = url
@@ -237,14 +238,20 @@ class WebPageContent(BaseContent, PageContent):
     #
 
     @property  # Override
-    def icon(self) -> Optional[URI]:
-        base64 = self.get_str(key='icon', default=None)
-        # TODO: convert 'data:' URI
-        return base64
+    def icon(self) -> Optional[PortableNetworkFile]:
+        img = self.__icon
+        if img is None:
+            base64 = self.get_str(key='icon', default=None)
+            img = self.__icon = PortableNetworkFile.parse(base64)
+        return img
 
     @icon.setter  # Override
-    def icon(self, base64: URI):
-        self['icon'] = base64
+    def icon(self, img: PortableNetworkFile):
+        if img is None:
+            self.pop('icon', None)
+        else:
+            self['icon'] = img.object
+        self.__icon = img
 
     #
     #   Description
@@ -340,11 +347,8 @@ class NameCardContent(BaseContent, NameCard):
 
     @property  # Override
     def avatar(self) -> Optional[PortableNetworkFile]:
-        if self.__avatar is None:
+        img = self.__avatar
+        if img is None:
             url = self.get('avatar')
-            if isinstance(url, str) and len(url) == 0:
-                # ignore empty URL
-                pass
-            else:
-                self.__avatar = PortableNetworkFile.parse(url)
-        return self.__avatar
+            img = self.__avatar = PortableNetworkFile.parse(url)
+        return img

{dimp-2.0.0 → dimp-2.1.0}/dimp/dkd/files.py

@@ -30,8 +30,9 @@
 
 from typing import Optional, Any, Dict
 
-from mkm.format import TransportableData
 from mkm.types import URI
+from mkm.format import TransportableData
+from mkm.format import PortableNetworkFile
 from mkm.crypto import DecryptKey
 
 from dkd import ContentType
@@ -115,16 +116,24 @@ class ImageFileContent(BaseFileContent, ImageContent):
                  url: Optional[URI] = None, password: Optional[DecryptKey] = None):
         msg_type = ContentType.IMAGE.value if content is None else None
         super().__init__(content, msg_type, data=data, filename=filename, url=url, password=password)
+        # small image
+        self.__thumbnail: Optional[PortableNetworkFile] = None
 
     @property  # Override
-    def thumbnail(self) -> Optional[URI]:
-        base64 = self.get_str(key='thumbnail', default=None)
-        # TODO: convert 'data:' URI
-        return base64
+    def thumbnail(self) -> Optional[PortableNetworkFile]:
+        img = self.__thumbnail
+        if img is None:
+            base64 = self.get_str(key='thumbnail', default=None)
+            img = self.__thumbnail = PortableNetworkFile.parse(base64)
+        return img
 
     @thumbnail.setter  # Override
-    def thumbnail(self, base64: URI):
-        self['thumbnail'] = base64
+    def thumbnail(self, img: PortableNetworkFile):
+        if img is None:
+            self.pop('thumbnail', None)
+        else:
+            self['thumbnail'] = img.object
+        self.__thumbnail = img
 
 
 class AudioFileContent(BaseFileContent, AudioContent):
@@ -153,13 +162,21 @@ class VideoFileContent(BaseFileContent, VideoContent):
                  url: Optional[URI] = None, password: Optional[DecryptKey] = None):
         msg_type = ContentType.VIDEO.value if content is None else None
         super().__init__(content, msg_type, data=data, filename=filename, url=url, password=password)
+        # small image
+        self.__snapshot: Optional[PortableNetworkFile] = None
 
     @property  # Override
-    def snapshot(self) -> Optional[URI]:
-        base64 = self.get_str(key='thumbnail', default=None)
-        # TODO: convert 'data:' URI
-        return base64
+    def snapshot(self) -> Optional[PortableNetworkFile]:
+        img = self.__snapshot
+        if img is None:
+            base64 = self.get_str(key='snapshot', default=None)
+            img = self.__snapshot = PortableNetworkFile.parse(base64)
+        return img
 
     @snapshot.setter  # Override
-    def snapshot(self, base64: URI):
-        self['snapshot'] = base64
+    def snapshot(self, img: PortableNetworkFile):
+        if img is None:
+            self.pop('snapshot', None)
+        else:
+            self['snapshot'] = img.object
+        self.__snapshot = img

{dimp-2.0.0 → dimp-2.1.0}/dimp/dkd/receipt.py

@@ -42,12 +42,11 @@ from mkm.types import Converter
 from dkd import Envelope
 
 from ..protocol import Command
-from ..protocol import ReceiptCommand, ReceiptCommandMixIn
+from ..protocol import ReceiptCommand
 from .commands import BaseCommand
 
 
-# noinspection PyAbstractClass
-class BaseReceipt(BaseCommand, ReceiptCommand, ABC):
+class BaseReceiptCommand(BaseCommand, ReceiptCommand, ABC):
     """
         Receipt Command
         ~~~~~~~~~~~~~~~
@@ -127,9 +126,6 @@ class BaseReceipt(BaseCommand, ReceiptCommand, ABC):
             signature = origin.get('signature')
             return Converter.get_str(value=signature, default=None)
 
-
-class BaseReceiptCommand(BaseReceipt, ReceiptCommandMixIn):
-
     @classmethod
     def from_text(cls, text: str, origin: Dict[str, Any] = None):
         return cls(text=text, origin=origin)

{dimp-2.0.0 → dimp-2.1.0}/dimp/protocol/__init__.py

@@ -58,7 +58,7 @@ from .customized import CustomizedContent
 
 from .commands import Command, CommandFactory
 from .commands import MetaCommand, DocumentCommand
-from .receipt import ReceiptCommand, ReceiptCommandMixIn
+from .receipt import ReceiptCommand
 
 from .groups import HistoryCommand, GroupCommand
 from .groups import InviteCommand, ExpelCommand, JoinCommand, QuitCommand, QueryCommand, ResetCommand
@@ -110,7 +110,7 @@ __all__ = [
 
     'Command', 'CommandFactory',
     'MetaCommand', 'DocumentCommand',
-    'ReceiptCommand', 'ReceiptCommandMixIn',
+    'ReceiptCommand',
 
     'HistoryCommand', 'GroupCommand',
     'InviteCommand', 'ExpelCommand', 'JoinCommand', 'QuitCommand', 'QueryCommand', 'ResetCommand',

{dimp-2.0.0 → dimp-2.1.0}/dimp/protocol/contents.py

@@ -208,12 +208,12 @@ class PageContent(Content, ABC):
 
     @property
     @abstractmethod
-    def icon(self) -> Optional[URI]:
+    def icon(self) -> Optional[PortableNetworkFile]:
         raise NotImplemented
 
     @icon.setter
     @abstractmethod
-    def icon(self, base64: URI):
+    def icon(self, img: PortableNetworkFile):
         raise NotImplemented
 
     #
@@ -263,16 +263,16 @@ class PageContent(Content, ABC):
     #
     @classmethod
     def create(cls, url: Optional[URI], html: Optional[str], title: str,
-               desc: Optional[str], icon: Optional[URI]):
+               desc: Optional[str], icon: Optional[PortableNetworkFile]):
         from ..dkd import WebPageContent
         return WebPageContent(url=url, html=html, title=title, desc=desc, icon=icon)
 
     @classmethod
-    def create_with_url(cls, url: URI, title: str, desc: Optional[str], icon: Optional[URI]):
+    def create_with_url(cls, url: URI, title: str, desc: Optional[str], icon: Optional[PortableNetworkFile]):
         return cls.create(url=url, html=None, title=title, desc=desc, icon=icon)
 
     @classmethod
-    def create_with_html(cls, html: str, title: str, desc: Optional[str], icon: Optional[URI]):
+    def create_with_html(cls, html: str, title: str, desc: Optional[str], icon: Optional[PortableNetworkFile]):
         return cls.create(url=None, html=html, title=title, desc=desc, icon=icon)
 
 

{dimp-2.0.0 → dimp-2.1.0}/dimp/protocol/files.py

@@ -33,6 +33,7 @@ from typing import Optional
 
 from mkm.types import URI
 from mkm.format import TransportableData
+from mkm.format import PortableNetworkFile
 from mkm.crypto import DecryptKey
 from dkd import ContentType, Content
 
@@ -175,13 +176,13 @@ class ImageContent(FileContent, ABC):
 
     @property
     @abstractmethod
-    def thumbnail(self) -> Optional[URI]:
+    def thumbnail(self) -> Optional[PortableNetworkFile]:
         # thumbnail of image
         raise NotImplemented
 
     @thumbnail.setter
     @abstractmethod
-    def thumbnail(self, base64: URI):
+    def thumbnail(self, img: PortableNetworkFile):
         raise NotImplemented
 
 
@@ -247,11 +248,11 @@ class VideoContent(FileContent, ABC):
 
     @property
     @abstractmethod
-    def snapshot(self) -> Optional[URI]:
+    def snapshot(self) -> Optional[PortableNetworkFile]:
         # snapshot of video
         raise NotImplemented
 
     @snapshot.setter
     @abstractmethod
-    def snapshot(self, base64: URI):
+    def snapshot(self, img: PortableNetworkFile):
         raise NotImplemented

{dimp-2.0.0 → dimp-2.1.0}/dimp/protocol/receipt.py

@@ -38,7 +38,7 @@
 from abc import abstractmethod
 from typing import Optional, Dict, Any
 
-from dkd import Envelope, Content, InstantMessage
+from dkd import Envelope, Content
 
 from .commands import Command
 
@@ -70,11 +70,6 @@ class ReceiptCommand(Command):
     def text(self) -> str:
         raise NotImplemented
 
-    @property  # protected
-    @abstractmethod
-    def origin(self) -> Optional[Dict]:
-        raise NotImplemented
-
     @property
     @abstractmethod
     def original_envelope(self) -> Optional[Envelope]:
@@ -90,10 +85,6 @@ class ReceiptCommand(Command):
     def original_signature(self) -> Optional[str]:
         raise NotImplemented
 
-    @abstractmethod
-    def match_message(self, msg: InstantMessage) -> bool:
-        raise NotImplemented
-
     #
     #   Factory method
     #
@@ -137,48 +128,3 @@ class ReceiptCommand(Command):
             info.pop('meta', None)
             info.pop('visa', None)
         return info
-
-
-# noinspection PyAbstractClass
-class ReceiptCommandMixIn(ReceiptCommand):
-
-    def match_message(self, msg: InstantMessage) -> bool:
-        if self.origin is None:
-            # receipt without original message info
-            return False
-        # check signature
-        sig1 = self.original_signature
-        if sig1 is not None:
-            # if contains signature, check it
-            sig2 = msg.get_str(key='signature', default=None)
-            if sig2 is not None:
-                return match_signatures(sig1, sig2)
-        # check envelope
-        env1 = self.original_envelope
-        if env1 is not None:
-            # if contains envelope, check it
-            if not match_envelopes(env1, msg.envelope):
-                return False
-        # check serial number
-        # (only the original message's receiver can know this number)
-        return self.original_sn == msg.content.sn
-
-
-def match_signatures(sig1: str, sig2: str) -> bool:
-    if len(sig1) > 8:
-        sig1 = sig1[-8:]
-    if len(sig2) > 8:
-        sig2 = sig2[-8:]
-    return sig1 == sig2
-
-
-def match_envelopes(env1: Envelope, env2: Envelope) -> bool:
-    if env1.sender != env2.sender:
-        return False
-    to1 = env1.group
-    if to1 is None:
-        to1 = env1.receiver
-    to2 = env2.group
-    if to2 is None:
-        to2 = env2.receiver
-    return to1 == to2

{dimp-2.0.0 → dimp-2.1.0}/dimp.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dimp
-Version: 2.0.0
+Version: 2.1.0
 Summary: Decentralized Instant Messaging Protocol
 Home-page: https://github.com/dimchat/core-py
 Author: Albert Moky

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

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

{dimp-2.0.0 → dimp-2.1.0}/setup.py

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

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

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