socket.d 2.4.11__tar.gz → 2.4.11.1__tar.gz

{socket.d-2.4.11 → socket.d-2.4.11.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: socket.d
-Version: 2.4.11
+Version: 2.4.11.1
 Summary: @noear/socket.d python project
 Home-page: https://socketd.noear.org/
 Author: noear,bai

{socket.d-2.4.11 → socket.d-2.4.11.1}/setup.py

@@ -4,7 +4,7 @@ from setuptools import setup,find_packages
 
 setup(
     name='socket.d',
-    version='2.4.11',
+    version='2.4.11.1',
     description='@noear/socket.d python project',
     author='noear,bai',
     url='https://socketd.noear.org/',

{socket.d-2.4.11 → socket.d-2.4.11.1}/socket.d.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: socket.d
-Version: 2.4.11
+Version: 2.4.11.1
 Summary: @noear/socket.d python project
 Home-page: https://socketd.noear.org/
 Author: noear,bai

{socket.d-2.4.11 → socket.d-2.4.11.1}/socket.d.egg-info/SOURCES.txt

@@ -93,11 +93,15 @@ socketd/transport/server/__init__.py
 socketd/transport/stream/RequestStream.py
 socketd/transport/stream/SendStream.py
 socketd/transport/stream/Stream.py
-socketd/transport/stream/StreamBase.py
 socketd/transport/stream/StreamManger.py
 socketd/transport/stream/StreamMangerDefault.py
 socketd/transport/stream/SubscribeStream.py
 socketd/transport/stream/__init__.py
+socketd/transport/stream/impl/RequestStreamImpl.py
+socketd/transport/stream/impl/SendStreamImpl.py
+socketd/transport/stream/impl/StreamBase.py
+socketd/transport/stream/impl/SubscribeStreamImpl.py
+socketd/transport/stream/impl/__init__.py
 socketd/transport/utils/AsyncUtils.py
 socketd/transport/utils/CompletableFuture.py
 socketd/transport/utils/__init__.py

{socket.d-2.4.11 → socket.d-2.4.11.1}/socketd/SocketD.py

@@ -24,65 +24,11 @@ def protocol_version() -> str:
 client_factory_map: Dict[str, ClientProvider] = {}
 server_factory_map: Dict[str, ServerProvider] = {}
 
-def create_server(schemaOrConfig: str | ServerConfig) -> Server:
-    Asserts.assert_null("schemaOrConfig", schemaOrConfig)
-    config:ServerConfig
-
-    if isinstance(schemaOrConfig, str):
-        config = ServerConfig(schemaOrConfig)
-    else:
-        config = schemaOrConfig
-
-    server = create_server_or_null(config)
-
-    if server is None:
-        raise RuntimeError(f"No socketd server providers were found: {config.get_schema()}")
-    else:
-        return server
-
-def create_server_or_null(config: ServerConfig) -> Server:
-    factory = server_factory_map.get(config.get_schema())
-
-    if factory is None:
-        return None
-    else:
-        return factory.create_server(config)
-
-
-def create_client(urlOrConfig: str | ClientConfig) -> Client:
-    Asserts.assert_null("urlOrConfig", urlOrConfig)
-    config:ClientConfig
-
-    if isinstance(urlOrConfig, str):
-        config = ClientConfig(urlOrConfig)
-    else:
-        config = urlOrConfig
-
-    client = create_client_or_null(config)
-
-    if client is None:
-        raise RuntimeError(f"No socketd client providers were found: {config.get_schema()}")
-    else:
-        return client
-
-def create_client_or_null(config: ClientConfig) -> Client:
-    Asserts.assert_null("config", config)
-
-    factory = client_factory_map.get(config.get_schema())
-    if factory is None:
-        return None
-    else:
-        return factory.create_client(config)
-
-
-def create_cluster_client(*urls):
-    return ClusterClient(*urls)
-
-
 def load_factories(factories: list[ClientProvider | ServerProvider], factory_map: Dict[str, object]) -> None:
     for factory in factories:
         for schema in factory.schema():
             factory_map[schema] = factory
+
 def create_server(schemaOrConfig: str | ServerConfig) -> Server:
     Asserts.assert_null("schemaOrConfig", schemaOrConfig)
     config:ServerConfig
@@ -124,7 +70,7 @@ def create_client(urlOrConfig: str | ClientConfig) -> Client:
     else:
         return client
 
-def create_client_or_null(config: ClientConfig) -> Client:
+def create_client_or_null(config: ClientConfig) -> Client | None:
     Asserts.assert_null("config", config)
 
     factory = client_factory_map.get(config.get_schema())
@@ -134,7 +80,7 @@ def create_client_or_null(config: ClientConfig) -> Client:
         return factory.create_client(config)
 
 
-def create_cluster_client(*urls):
+def create_cluster_client(*urls) -> Client:
     return ClusterClient(*urls)
 
 

{socket.d-2.4.11 → socket.d-2.4.11.1}/socketd/cluster/ClusterClientSession.py

@@ -45,20 +45,20 @@ class ClusterClientSession(ClientSession):
     def session_id(self) -> str:
         return self.__sessionId
 
-    async def send(self, event: str, content: Entity) -> SendStream:
+    def send(self, event: str, content: Entity) -> SendStream:
         sender = self.get_session_any(None)
 
-        return await sender.send(event, content)
+        return sender.send(event, content)
 
-    async def send_and_request(self, event: str, content: Entity, timeout: int) -> RequestStream:
+    def send_and_request(self, event: str, content: Entity, timeout: int) -> RequestStream:
         sender = self.get_session_any(None)
 
-        return await sender.send_and_request(event, content, timeout)
+        return sender.send_and_request(event, content, timeout)
 
-    async def send_and_subscribe(self, event: str, content: Entity, timeout: int = 0) -> SubscribeStream:
+    def send_and_subscribe(self, event: str, content: Entity, timeout: int = 0) -> SubscribeStream:
         sender = self.get_session_any(None)
 
-        return await sender.send_and_subscribe(event, content, timeout)
+        return sender.send_and_subscribe(event, content, timeout)
 
     async def preclose(self):
         for session in self.__sessionSet:

{socket.d-2.4.11 → socket.d-2.4.11.1}/socketd/transport/client/Client.py

@@ -33,11 +33,11 @@ class Client(ABC):
 
     # 打开会话
     @abstractmethod
-    def open(self) -> Session | Future: ...
+    async def open(self) -> Session: ...
 
     # 打开会话或出异常（即要求第一次是连接成功的）
     @abstractmethod
-    def open_or_throw(self) -> Session | Future: ...
+    async def open_or_throw(self) -> Session: ...
 
 
 class ClientInternal(Client):

{socket.d-2.4.11 → socket.d-2.4.11.1}/socketd/transport/client/ClientBase.py

@@ -86,11 +86,11 @@ class ClientBase(ClientInternal, ABC):
 
         return clientChannel.get_session()
 
-    def open(self) -> Awaitable[Session]:
-        return self._open_do(False)
+    async def open(self) -> Session:
+        return await self._open_do(False)
 
-    def open_or_throw(self) -> Awaitable[Session]:
-        return self._open_do(True)
+    async def open_or_throw(self) -> Session:
+        return await self._open_do(True)
 
     @abstractmethod
     def create_connector(self):

{socket.d-2.4.11 → socket.d-2.4.11.1}/socketd/transport/client/ClientChannel.py

@@ -8,7 +8,7 @@ from socketd.transport.core.ChannelInternal import ChannelInternal
 from socketd.transport.core.Costants import Constants
 from socketd.transport.core.impl.LogConfig import log
 from socketd.transport.core.impl.SessionDefault import SessionDefault
-from socketd.transport.stream.StreamManger import StreamInternal
+from socketd.transport.stream.Stream import StreamInternal
 from socketd.transport.core.impl.ChannelBase import ChannelBase
 from socketd.transport.client.ClientConnector import ClientConnector
 

{socket.d-2.4.11 → socket.d-2.4.11.1}/socketd/transport/client/ClientSession.py

@@ -21,20 +21,17 @@ class ClientSession:
         ...
 
     @abc.abstractmethod
-    async def send(self, event: str, content: Entity) -> SendStream:
+    def send(self, event: str, content: Entity) -> SendStream:
         ...
 
     @abc.abstractmethod
-    async def send_and_request(self, event: str, content: Entity, timeout: int = 0) -> RequestStream:
+    def send_and_request(self, event: str, content: Entity, timeout: int = 0) -> RequestStream:
         ...
 
     @abc.abstractmethod
-    async def send_and_subscribe(self, event: str, content: Entity, timeout: int = 0) -> SubscribeStream:
+    def send_and_subscribe(self, event: str, content: Entity, timeout: int = 0) -> SubscribeStream:
         ...
 
-    async def close_starting(self):
-        self.preclose()
-
     @abc.abstractmethod
     async def preclose(self):
         ...

{socket.d-2.4.11 → socket.d-2.4.11.1}/socketd/transport/core/Channel.py

@@ -9,7 +9,7 @@ from socketd.transport.core.Frame import Frame
 from socketd.transport.core.Message import Message
 from abc import abstractmethod, ABC
 
-from socketd.transport.stream.StreamManger import StreamInternal
+from socketd.transport.stream.Stream import StreamInternal
 
 
 class Channel(ABC):

{socket.d-2.4.11 → socket.d-2.4.11.1}/socketd/transport/core/FragmentHandler.py

@@ -3,7 +3,7 @@ from typing import Callable
 
 from socketd.transport.core.Frame import Frame
 from socketd.transport.core.Message import MessageInternal
-from socketd.transport.stream.StreamManger import StreamInternal
+from socketd.transport.stream.Stream import StreamInternal
 from socketd.transport.core import Channel
 
 

{socket.d-2.4.11 → socket.d-2.4.11.1}/socketd/transport/core/fragment/FragmentHandlerBase.py

@@ -10,7 +10,7 @@ from socketd.transport.core.entity.EntityDefault import EntityDefault
 from socketd.transport.core.FragmentAggregator import FragmentAggregator
 from socketd.transport.core.fragment.FragmentAggregatorDefault import FragmentAggregatorDefault
 from socketd.transport.core.FragmentHandler import FragmentHandler
-from socketd.transport.stream.StreamManger import StreamInternal
+from socketd.transport.stream.Stream import StreamInternal
 
 
 class FragmentHandlerBase(FragmentHandler, ABC):

{socket.d-2.4.11 → socket.d-2.4.11.1}/socketd/transport/core/impl/ChannelDefault.py

@@ -9,8 +9,8 @@ from socketd.transport.core.ChannelSupporter import ChannelSupporter
 from socketd.transport.core.Message import MessageInternal, Message
 from socketd.transport.core.entity.MessageBuilder import MessageBuilder
 from socketd.transport.core.impl.LogConfig import log
-from socketd.transport.stream.Stream import Stream
-from socketd.transport.stream.StreamManger import StreamManger, StreamInternal
+from socketd.transport.stream.Stream import Stream, StreamInternal
+from socketd.transport.stream.StreamManger import StreamManger
 from socketd.transport.core.impl.ChannelBase import ChannelBase
 from socketd.transport.core.Costants import Constants
 from socketd.transport.core.Flags import Flags

{socket.d-2.4.11 → socket.d-2.4.11.1}/socketd/transport/core/impl/ProcessorDefault.py

@@ -12,7 +12,7 @@ from socketd.transport.core.EntityMetas import EntityMetas
 from socketd.transport.core.Frame import Frame
 from socketd.transport.core.impl.LogConfig import log
 from socketd.transport.core.listener.SimpleListener import SimpleListener
-from socketd.transport.stream.StreamManger import StreamInternal
+from socketd.transport.stream.Stream import StreamInternal
 from socketd.utils.RunUtils import RunUtils
 
 

{socket.d-2.4.11 → socket.d-2.4.11.1}/socketd/transport/core/impl/SessionDefault.py

@@ -16,6 +16,11 @@ from socketd.transport.stream.SubscribeStream import SubscribeStream
 
 from loguru import logger
 
+from socketd.transport.stream.impl.RequestStreamImpl import RequestStreamImpl
+from socketd.transport.stream.impl.SendStreamImpl import SendStreamImpl
+from socketd.transport.stream.impl.SubscribeStreamImpl import SubscribeStreamImpl
+from socketd.utils.RunUtils import RunUtils
+
 
 class SessionDefault(SessionBase):
 
@@ -41,27 +46,27 @@ class SessionDefault(SessionBase):
     async def send_ping(self):
         await self._channel.send_ping()
 
-    async def send(self, topic: str, content: Entity) -> SendStream:
+    def send(self, topic: str, content: Entity) -> SendStream:
         message = MessageBuilder().sid(self.generate_id()).event(topic).entity(content).build()
 
-        stream: SendStream = SendStream(message.sid())
-        await self._channel.send(Frame(Flags.Message, message), stream)
+        stream: SendStream = SendStreamImpl(message.sid())
+        RunUtils.taskTry(self._channel.send(Frame(Flags.Message, message), stream))
         return stream
 
-    async def send_and_request(self, event: str, content: Entity,
+    def send_and_request(self, event: str, content: Entity,
                                timeout: int = 100) -> RequestStream:
 
         if timeout < 100:
             timeout = self._channel.get_config().get_request_timeout() / 1000
         message = MessageBuilder().sid(self.generate_id()).event(event).entity(content).build()
-        stream = RequestStream(message.sid(), timeout)
-        await self._channel.send(Frame(Flags.Request, message), stream)
+        stream:RequestStream = RequestStreamImpl(message.sid(), timeout)
+        RunUtils.taskTry(self._channel.send(Frame(Flags.Request, message), stream))
         return stream
 
-    async def send_and_subscribe(self, event: str, content: Entity, timeout: int = 0):
+    def send_and_subscribe(self, event: str, content: Entity, timeout: int = 0):
         message = MessageBuilder().sid(self.generate_id()).event(event).entity(content).build()
-        stream = SubscribeStream(message.sid(), timeout)
-        await self._channel.send(Frame(Flags.Subscribe, message), stream)
+        stream:SubscribeStream = SubscribeStreamImpl(message.sid(), timeout)
+        RunUtils.taskTry(self._channel.send(Frame(Flags.Subscribe, message), stream))
         return stream
 
     async def reply(self, from_msg: Message, content: Entity):

socket.d-2.4.11.1/socketd/transport/stream/RequestStream.py

@@ -0,0 +1,34 @@
+from abc import abstractmethod
+from typing import Callable
+from socketd.transport.stream.Stream import Stream
+from socketd.transport.core.Entity import Reply
+
+
+class RequestStream(Stream):
+    @abstractmethod
+    async def get(self) -> Reply:
+        ...
+
+    @abstractmethod
+    def then_error(self, onError: Callable[[Exception], None]) -> 'SendStream':
+        """
+        异常发生
+        :param onError: 当异常发生时执行的函数，接受一个异常参数
+        """
+        ...
+
+    @abstractmethod
+    def then_progress(self, onProgress: Callable[[bool, int, int], None]) -> 'SendStream':
+        """
+        进度发生时
+        :param onProgress (isSend, val, max)
+        """
+        ...
+
+    @abstractmethod
+    def then_reply(self, onReply: Callable[[Reply], None]) -> 'SendStream':
+        """
+        答复发生时
+        """
+        ...
+

socket.d-2.4.11.1/socketd/transport/stream/SendStream.py

@@ -0,0 +1,22 @@
+from abc import abstractmethod
+from typing import Callable
+
+from socketd.transport.stream.Stream import Stream
+
+
+class SendStream(Stream):
+    @abstractmethod
+    def then_error(self, onError: Callable[[Exception], None]) -> 'SendStream':
+        """
+        异常发生
+        :param onError: 当异常发生时执行的函数，接受一个异常参数
+        """
+        ...
+
+    @abstractmethod
+    def then_progress(self, onProgress: Callable[[bool, int, int], None]) -> 'SendStream':
+        """
+        进度发生时
+        :param onProgress (isSend, val, max)
+        """
+        ...

socket.d-2.4.11/socketd/transport/stream/StreamManger.py → socket.d-2.4.11.1/socketd/transport/stream/Stream.py

@@ -1,7 +1,21 @@
 import asyncio
 from abc import ABC, abstractmethod
 
-from socketd.transport.stream.Stream import Stream
+from socketd.transport.stream.StreamManger import StreamManger
+
+
+class Stream(ABC):
+
+    @abstractmethod
+    def sid(self) -> str:
+        """流ID"""
+        ...
+
+    @abstractmethod
+    def is_done(self):
+        """是否结束接收"""
+        ...
+
 
 
 class StreamInternal(Stream, ABC):
@@ -13,7 +27,7 @@ class StreamInternal(Stream, ABC):
     def timeout(self) -> float: ...
 
     @abstractmethod
-    def insurance_start(self, streamManger: 'StreamManger', streamTimeout: float) -> None: ...
+    def insurance_start(self, streamManger: StreamManger, streamTimeout: float) -> None: ...
 
     @abstractmethod
     def insurance_cancel(self) -> None: ...
@@ -25,17 +39,4 @@ class StreamInternal(Stream, ABC):
     def on_error(self, error): ...
 
     @abstractmethod
-    def on_progress(self, is_send, val, max_val): ...
-
-
-class StreamManger(ABC):
-
-    @abstractmethod
-    def add_stream(self, sid: str, stream: StreamInternal): ...
-
-    @abstractmethod
-    def get_stream(self, sid: str) -> StreamInternal: ...
-
-    @abstractmethod
-    def remove_stream(self, sid: str): ...
-
+    def on_progress(self, is_send, val, max_val): ...

socket.d-2.4.11.1/socketd/transport/stream/StreamManger.py

@@ -0,0 +1,13 @@
+from abc import ABC, abstractmethod
+
+class StreamManger(ABC):
+
+    @abstractmethod
+    def add_stream(self, sid: str, stream: 'StreamInternal'): ...
+
+    @abstractmethod
+    def get_stream(self, sid: str) -> 'StreamInternal': ...
+
+    @abstractmethod
+    def remove_stream(self, sid: str): ...
+

{socket.d-2.4.11 → socket.d-2.4.11.1}/socketd/transport/stream/StreamMangerDefault.py

@@ -1,6 +1,7 @@
 import logging
 
-from socketd.transport.stream.StreamManger import StreamManger, StreamInternal
+from socketd.transport.stream.Stream import StreamInternal
+from socketd.transport.stream.StreamManger import StreamManger
 
 logger = logging.getLogger(__name__)
 

socket.d-2.4.11.1/socketd/transport/stream/SubscribeStream.py

@@ -0,0 +1,30 @@
+from abc import abstractmethod
+from typing import Callable
+
+from socketd.transport.core.Entity import Reply
+from socketd.transport.stream.Stream import Stream
+
+
+class SubscribeStream(Stream):
+    @abstractmethod
+    def then_error(self, onError: Callable[[Exception], None]) -> 'SubscribeStream':
+        """
+        异常发生
+        :param onError: 当异常发生时执行的函数，接受一个异常参数
+        """
+        ...
+
+    @abstractmethod
+    def then_progress(self, onProgress: Callable[[bool, int, int], None]) -> 'SubscribeStream':
+        """
+        进度发生时
+        :param onProgress (isSend, val, max)
+        """
+        ...
+
+    @abstractmethod
+    def then_reply(self, onReply: Callable[[Reply], None]) -> 'SubscribeStream':
+        """
+        答复发生时
+        """
+        ...

socket.d-2.4.11.1/socketd/transport/stream/impl/RequestStreamImpl.py

@@ -0,0 +1,47 @@
+import asyncio
+from typing import Callable
+
+from socketd.exception.SocketDExecption import SocketDTimeoutException, SocketDException
+from socketd.transport.core.Costants import Constants
+from socketd.transport.core.Entity import Reply
+from socketd.transport.core.Message import MessageInternal
+from socketd.transport.stream.RequestStream import RequestStream
+from socketd.transport.stream.impl.StreamBase import StreamBase
+from socketd.transport.utils.CompletableFuture import CompletableFuture
+
+
+class RequestStreamImpl(StreamBase, RequestStream):
+    def __init__(self, sid: str, timeout: int):
+        super().__init__(sid, Constants.DEMANDS_SINGLE, timeout)
+        self.__future: CompletableFuture = CompletableFuture()
+
+    def is_done(self):
+        return self.__future.done()
+
+    def __await__(self):
+        try:
+            return self.__future.get(self.timeout() / 1000.0)
+        except asyncio.TimeoutError as _e:
+            raise SocketDTimeoutException(f"Request reply timeout>{self.timeout()}  sid={self.sid()}")
+        except Exception as _e:
+            raise SocketDException(f"Request failed, sid= sid={self.sid()} {str(_e)}")
+
+    async def get(self) -> Reply:
+        if self.__future.done():
+            return self.__future.get_result()
+        return await self.__await__()
+
+    async def on_reply(self, reply: MessageInternal):
+        return await self.__future.set_result(reply)
+
+    def then_reply(self, onReply: Callable[[MessageInternal], None]) -> RequestStream:
+        self.__future.then_callback(onReply)
+        return self
+
+    def then_error(self, onError: Callable[[Exception], None]) -> RequestStream:
+        super().then_error_do(onError)
+        return self
+
+    def then_progress(self, onProgress: Callable[[bool, int, int], None]) -> RequestStream:
+        super().then_progress_do(onProgress)
+        return self

socket.d-2.4.11.1/socketd/transport/stream/impl/SendStreamImpl.py

@@ -0,0 +1,25 @@
+from typing import Callable
+
+from socketd.transport.core.Costants import Constants
+from socketd.transport.stream.SendStream import SendStream
+from socketd.transport.stream.impl.StreamBase import StreamBase
+
+
+class SendStreamImpl(StreamBase, SendStream):
+    def __init__(self, sid: str):
+        super().__init__(sid, Constants.DEMANDS_ZERO, 0)
+
+    def is_done(self):
+        return True
+
+    async def on_reply(self, reply):
+        ...
+
+    def then_error(self, onError: Callable[[Exception], None]) -> 'SendStream':
+        super().then_error_do(onError)
+        return self
+
+
+    def then_progress(self, onProgress: Callable[[bool, int, int], None]) -> 'SendStream':
+        super().then_progress(onProgress)
+        return self

{socket.d-2.4.11/socketd/transport/stream → socket.d-2.4.11.1/socketd/transport/stream/impl}/StreamBase.py

@@ -3,7 +3,9 @@ from abc import ABC
 from typing import Callable, Optional
 
 from socketd.exception.SocketDExecption import SocketDTimeoutException
-from socketd.transport.stream.StreamManger import StreamInternal, StreamManger
+from socketd.transport.core.Message import MessageInternal
+from socketd.transport.stream.Stream import StreamInternal
+from socketd.transport.stream.StreamManger import StreamManger
 from socketd.transport.utils.CompletableFuture import CompletableFuture
 
 
@@ -11,36 +13,35 @@ class StreamBase(StreamInternal, ABC):
     """流接收器基类"""
 
     def __init__(self, sid: str, demands: int, timeout: int):
-        self.__onError: Callable[[Exception], None] = None
         self.__sid = sid
         self.__timeout = timeout
         self.__demands = demands
+
+        self.__onError: Callable[[Exception], None] = None
         self.__doOnError: Callable[[Exception], None] = None
         self.__doOnProgress: Callable[[bool, int, int], None] = None
+
         self.__insuranceFuture: Optional[asyncio.Future] = None
 
-    def on_error(self, error: Exception):
-        if error:
-            self.__doOnError(error)
+    def sid(self) -> str:
+        return self.__sid
 
     def is_done(self):
         return True
 
-    def then_progress(self, on_progress: Callable[[bool, int, int], None]):
-        pass
-
-    def get_sid(self) -> str:
-        return self.__sid
-
-    def timeout(self):
-        return self.__timeout
-
-    def then_error(self, onError: Callable[[Exception], None]):
+    def then_error_do(self, onError: Callable[[Exception], None]):
         self.__onError = onError
 
+    def then_progress_do(self, onProgress: Callable[[bool, int, int], None]):
+        self.__doOnProgress = onProgress
+
     def demands(self) -> int:
         return self.__demands
 
+    def timeout(self):
+        return self.__timeout
+
+    # 保险开始（避免永久没有回调，造成内存不能释放）
     def insurance_start(self, streamManger: StreamManger, streamTimeout: float) -> None:
         if self.__insuranceFuture:
             return
@@ -53,10 +54,21 @@ class StreamBase(StreamInternal, ABC):
         self.__insuranceFuture = CompletableFuture(__insuranceFuture())
         asyncio.run_coroutine_threadsafe(self.__insuranceFuture.get(streamTimeout), asyncio.get_running_loop())
 
+    # 保险取消
     def insurance_cancel(self) -> None:
         if self.__insuranceFuture:
             self.__insuranceFuture.cancel()
 
+    def on_reply(self, reply:MessageInternal):
+        ...
+
+    def on_error(self, error: Exception):
+        if error:
+            self.__doOnError(error)
+
     def on_progress(self, is_send, val, max_val):
         if self.__doOnProgress:
             self.__doOnProgress(is_send, val, max_val)
+
+
+