dimples 1.6.1__tar.gz → 1.6.2__tar.gz

{dimples-1.6.1 → dimples-1.6.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dimples
-Version: 1.6.1
+Version: 1.6.2
 Summary: DIMP Library for Edges and Stations
 Home-page: https://github.com/dimchat/demo-py
 Author: Albert Moky
@@ -54,9 +54,9 @@ License-File: LICENSE
         # 'dkd>=2.4.0',
         # 'mkm>=2.4.0',
 
-        'startrek>=2.2.2',
-        'tcp>=2.2.2',
-        'udp>=2.2.2',
+        'startrek>=2.3.0',
+        'tcp>=2.3.0',
+        'udp>=2.3.0',
 
         'aiou>=1.1.0',
     ]

{dimples-1.6.1 → dimples-1.6.2}/README.md

@@ -40,9 +40,9 @@
         # 'dkd>=2.4.0',
         # 'mkm>=2.4.0',
 
-        'startrek>=2.2.2',
-        'tcp>=2.2.2',
-        'udp>=2.2.2',
+        'startrek>=2.3.0',
+        'tcp>=2.3.0',
+        'udp>=2.3.0',
 
         'aiou>=1.1.0',
     ]

{dimples-1.6.1 → dimples-1.6.2}/dimples/client/compat/loader.py

@@ -60,6 +60,7 @@ class ClientExtensionLoader(CommonExtensionLoader):
     # Override
     def load(self):
         super().load()
+        self._register_customized_handlers()
 
     # noinspection PyMethodMayBeStatic
     def _register_customized_handlers(self):

{dimples-1.6.1 → dimples-1.6.2}/dimples/common/mkm/utils.py

@@ -31,6 +31,7 @@
 from typing import Optional, Union, Iterable, Dict
 
 from dimsdk import utf8_encode
+from dimsdk import Converter
 from dimsdk import DateTime
 
 from dimsdk import VerifyKey
@@ -105,8 +106,9 @@ class DocumentUtils:
         return helper.get_document_id(document=document)
 
     @classmethod
-    def get_document_name(cls, document: Union[Dict, Document]) -> Optional[str]:
-        return document.get_property(name='name')
+    def get_document_name(cls, document: Document) -> Optional[str]:
+        value = document.get_property(name='name')
+        return Converter.get_str(value=value)
 
     @classmethod
     def is_before(cls, old_time: Optional[DateTime], this_time: Optional[DateTime]) -> bool:

{dimples-1.6.1 → dimples-1.6.2}/dimples/conn/gate.py

@@ -28,9 +28,8 @@
 # SOFTWARE.
 # ==============================================================================
 
-import socket
 from abc import ABC
-from typing import Generic, TypeVar, Optional, Union
+from typing import Generic, TypeVar, Optional
 
 from startrek.types import SocketAddress
 from startrek.net.state import StateOrder
@@ -155,12 +154,12 @@ class CommonGate(StarGate, Logging, Generic[H], ABC):
         self.debug(msg='sent %d byte(s): %s' % (len(data), connection.remote_address))
 
     # Override
-    async def connection_failed(self, error: Union[IOError, socket.error], data: bytes, connection: Connection):
+    async def connection_failed(self, error: OSError, data: bytes, connection: Connection):
         await super().connection_failed(error=error, data=data, connection=connection)
         self.error(msg='failed to send %d byte(s): %s, remote=%s' % (len(data), error, connection.remote_address))
 
     # Override
-    async def connection_error(self, error: Union[IOError, socket.error], connection: Connection):
+    async def connection_error(self, error: OSError, connection: Connection):
         await super().connection_error(error=error, connection=connection)
         if error is not None and str(error).startswith('failed to send: '):
             self.warning(msg='ignore socket error: %s, remote=%s' % (error, connection.remote_address))

{dimples-1.6.1 → dimples-1.6.2}/dimples/conn/gatekeeper.py

@@ -41,11 +41,11 @@ from startrek import BaseChannel
 from startrek import Connection, ConnectionDelegate, BaseConnection
 from startrek import Arrival, Departure
 from startrek import Porter, PorterStatus, PorterDelegate
+from startrek import SocketHelper
 
 from tcp import StreamChannel
 from tcp import ServerHub, ClientHub
 
-from ..utils import get_remote_address, get_local_address
 from ..utils import get_msg_info
 from ..utils import Runner, Log, Logging
 
@@ -66,8 +66,8 @@ class StreamServerHub(ServerHub):
 
     # Override
     def _set_channel(self, channel: Channel,
-                     remote: Optional[SocketAddress], local: Optional[SocketAddress]):
-        super()._set_channel(channel=channel, remote=remote, local=None)
+                     remote: Optional[SocketAddress], local: Optional[SocketAddress]) -> Optional[Channel]:
+        return super()._set_channel(channel=channel, remote=remote, local=None)
 
     # Override
     def _remove_channel(self, channel: Optional[Channel],
@@ -80,8 +80,8 @@ class StreamServerHub(ServerHub):
 
     # Override
     def _set_connection(self, connection: Connection,
-                        remote: SocketAddress, local: Optional[SocketAddress]):
-        super()._set_connection(connection=connection, remote=remote, local=None)
+                        remote: SocketAddress, local: Optional[SocketAddress]) -> Optional[Connection]:
+        return super()._set_connection(connection=connection, remote=remote, local=None)
 
     # Override
     def _remove_connection(self, connection: Optional[Connection],
@@ -100,8 +100,8 @@ class StreamClientHub(ClientHub):
 
     # Override
     def _set_channel(self, channel: Channel,
-                     remote: Optional[SocketAddress], local: Optional[SocketAddress]):
-        super()._set_channel(channel=channel, remote=remote, local=None)
+                     remote: Optional[SocketAddress], local: Optional[SocketAddress]) -> Optional[Channel]:
+        return super()._set_channel(channel=channel, remote=remote, local=None)
 
     # Override
     def _remove_channel(self, channel: Optional[Channel],
@@ -114,8 +114,8 @@ class StreamClientHub(ClientHub):
 
     # Override
     def _set_connection(self, connection: Connection,
-                        remote: SocketAddress, local: Optional[SocketAddress]):
-        super()._set_connection(connection=connection, remote=remote, local=None)
+                        remote: SocketAddress, local: Optional[SocketAddress]) -> Optional[Connection]:
+        return super()._set_connection(connection=connection, remote=remote, local=None)
 
     # Override
     def _remove_connection(self, connection: Optional[Connection],
@@ -189,9 +189,10 @@ class GateKeeper(Runner, PorterDelegate, Logging):
             # server
             sock.setblocking(False)
             # sock.settimeout(0.5)
+            helper = SocketHelper()
             if address is None:
-                address = get_remote_address(sock=sock)
-            channel = StreamChannel(remote=address, local=get_local_address(sock=sock))
+                address = helper.get_remote_address(sock=sock)
+            channel = StreamChannel(remote=address, local=helper.get_local_address(sock=sock))
             coro = channel.set_socket(sock=sock)
             Runner.async_task(coro=coro)
             hub = StreamServerHub(delegate=delegate)
@@ -284,11 +285,11 @@ class GateKeeper(Runner, PorterDelegate, Logging):
         pass
 
     # Override
-    async def porter_failed(self, error: IOError, ship: Departure, porter: Porter):
+    async def porter_failed(self, error: OSError, ship: Departure, porter: Porter):
         self.error(msg='docker failed to send ship: %s, %s' % (error, porter))
 
     # Override
-    async def porter_error(self, error: IOError, ship: Departure, porter: Porter):
+    async def porter_error(self, error: OSError, ship: Departure, porter: Porter):
         self.error(msg='docker error while sending ship: %s, %s' % (error, porter))
         if isinstance(ship, MessageWrapper):
             msg = ship.msg

{dimples-1.6.1 → dimples-1.6.2}/dimples/database/dos/document.py

@@ -90,7 +90,7 @@ def parse_document(dictionary: dict, identifier: ID = None, doc_type: str = '*')
     else:
         assert identifier == doc_id, 'document ID not match: %s, %s' % (identifier, doc_id)
     # check document type
-    doc_ty = dictionary.get('type')
+    doc_ty = DocumentUtils.get_document_type(document=dictionary)
     if doc_ty is not None:
         doc_type = doc_ty
     # check document data

{dimples-1.6.1 → dimples-1.6.2}/dimples/utils/__init__.py

@@ -51,7 +51,6 @@ from dimplugins.mem import MemoryCache, ThanosCache
 from startrek.skywalker import Singleton
 from startrek.skywalker import Runnable, Runner, Daemon
 from startrek.fsm import Delegate as StateDelegate
-from startrek.net.socket import get_remote_address, get_local_address
 
 from aiou import Path, File, TextFile, JSONFile
 
@@ -138,8 +137,6 @@ __all__ = [
     'Runnable', 'Runner', 'Daemon',
     'StateDelegate',
 
-    'get_remote_address', 'get_local_address',
-
 
     'Singleton',
     'Log', 'Logging',

{dimples-1.6.1 → dimples-1.6.2}/dimples.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dimples
-Version: 1.6.1
+Version: 1.6.2
 Summary: DIMP Library for Edges and Stations
 Home-page: https://github.com/dimchat/demo-py
 Author: Albert Moky
@@ -54,9 +54,9 @@ License-File: LICENSE
         # 'dkd>=2.4.0',
         # 'mkm>=2.4.0',
 
-        'startrek>=2.2.2',
-        'tcp>=2.2.2',
-        'udp>=2.2.2',
+        'startrek>=2.3.0',
+        'tcp>=2.3.0',
+        'udp>=2.3.0',
 
         'aiou>=1.1.0',
     ]

{dimples-1.6.1 → dimples-1.6.2}/dimples.egg-info/requires.txt

@@ -4,7 +4,7 @@ dimsdk==2.4.0
 dimp==2.4.0
 dkd==2.4.0
 mkm==2.4.0
-startrek==2.2.2
-tcp==2.2.2
-udp==2.2.2
+startrek==2.3.0
+tcp==2.3.0
+udp==2.3.0
 aiou==1.1.0

{dimples-1.6.1 → dimples-1.6.2}/setup.py

@@ -14,7 +14,7 @@ import io
 
 from setuptools import setup, find_packages
 
-__version__ = '1.6.1'
+__version__ = '1.6.2'
 __author__ = 'Albert Moky'
 __contact__ = 'albert.moky@gmail.com'
 
@@ -60,9 +60,9 @@ setup(
         'dkd==2.4.0',
         'mkm==2.4.0',
 
-        'startrek==2.2.2',
-        'tcp==2.2.2',
-        'udp==2.2.2',
+        'startrek==2.3.0',
+        'tcp==2.3.0',
+        'udp==2.3.0',
 
         'aiou==1.1.0',
     ]