socket.d 2.4.13__tar.gz → 2.4.13.1__tar.gz

{socket.d-2.4.13 → socket.d-2.4.13.1}/PKG-INFO

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

{socket.d-2.4.13 → socket.d-2.4.13.1}/setup.py

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

{socket.d-2.4.13 → socket.d-2.4.13.1}/socket.d.egg-info/PKG-INFO

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

{socket.d-2.4.13 → socket.d-2.4.13.1}/socketd/transport/core/listener/EventListener.py

@@ -41,7 +41,7 @@ class EventListener(Listener):
 
     async def on_open(self, session: Session):
         if self._doOnOpenHandler:
-            await RunUtils.waitTry(await self._doOnOpenHandler(session))
+            await RunUtils.waitTry(self._doOnOpenHandler(session))
 
     async def on_message(self, session: Session, message: Message):
         if self._doOnMessageHandler:

{socket.d-2.4.13 → socket.d-2.4.13.1}/socketd/transport/stream/impl/RequestStreamImpl.py

@@ -31,17 +31,24 @@ class RequestStreamImpl(StreamBase, RequestStream):
             return self.__future.get_result()
         return await self.__await__()
 
-    async def on_reply(self, reply: MessageInternal):
-        return await self.__future.set_result(reply)
+    def on_reply(self, reply: MessageInternal):
+        self.__future.accept(reply)
+
+    def on_error(self, error: Exception):
+        self.__future.cancel()
+        super().on_error(error)
 
     def then_reply(self, onReply: Callable[[MessageInternal], None]) -> RequestStream:
-        self.__future.then_callback(onReply)
+        async def _then_reply_do(r: MessageInternal, e: Exception):
+            if r:
+                onReply(r)
+        self.__future.then_async_callback(_then_reply_do)
         return self
 
     def then_error(self, onError: Callable[[Exception], None]) -> RequestStream:
-        super().then_error_do(onError)
+        self._then_error_do(onError)
         return self
 
     def then_progress(self, onProgress: Callable[[bool, int, int], None]) -> RequestStream:
-        super().then_progress_do(onProgress)
+        self._then_progress_do(onProgress)
         return self

{socket.d-2.4.13 → socket.d-2.4.13.1}/socketd/transport/stream/impl/SendStreamImpl.py

@@ -16,7 +16,7 @@ class SendStreamImpl(StreamBase, SendStream):
         ...
 
     def then_error(self, onError: Callable[[Exception], None]) -> 'SendStream':
-        super().then_error_do(onError)
+        super()._then_error_do(onError)
         return self
 
 

{socket.d-2.4.13 → socket.d-2.4.13.1}/socketd/transport/stream/impl/StreamBase.py

@@ -7,6 +7,7 @@ from socketd.transport.core.Message import MessageInternal
 from socketd.transport.stream.Stream import StreamInternal
 from socketd.transport.stream.StreamManger import StreamManger
 from socketd.utils.CompletableFuture import CompletableFuture
+from socketd.utils.RunUtils import RunUtils
 
 
 class StreamBase(StreamInternal, ABC):
@@ -28,10 +29,10 @@ class StreamBase(StreamInternal, ABC):
     def is_done(self):
         return True
 
-    def then_error_do(self, onError: Callable[[Exception], None]):
+    def _then_error_do(self, onError: Callable[[Exception], None]):
         self.__doOnError = onError
 
-    def then_progress_do(self, onProgress: Callable[[bool, int, int], None]):
+    def _then_progress_do(self, onProgress: Callable[[bool, int, int], None]):
         self.__doOnProgress = onProgress
 
     def demands(self) -> int:
@@ -63,11 +64,11 @@ class StreamBase(StreamInternal, ABC):
 
     def on_error(self, error: Exception):
         if error and self.__doOnError:
-            self.__doOnError(error)
+            RunUtils.taskTry(self.__doOnError(error))
 
     def on_progress(self, is_send, val, max_val):
         if self.__doOnProgress:
-            self.__doOnProgress(is_send, val, max_val)
+            RunUtils.taskTry(self.__doOnProgress(is_send, val, max_val))
 
 
 

{socket.d-2.4.13 → socket.d-2.4.13.1}/socketd/transport/stream/impl/SubscribeStreamImpl.py

@@ -4,13 +4,14 @@ from socketd.transport.core.Costants import Constants
 from socketd.transport.core.Message import MessageInternal
 from socketd.transport.stream.SubscribeStream import SubscribeStream
 from socketd.transport.stream.impl.StreamBase import StreamBase
+from socketd.utils.RunUtils import RunUtils
 
 
 class SubscribeStreamImpl(StreamBase, SubscribeStream):
     def __init__(self, sid: str, timeout):
         super().__init__(sid, Constants.DEMANDS_MULTIPLE, timeout)
-        self.__isDone: Optional[bool] = None
-        self.__doOnReply: Optional[Callable] = None
+        self.__isDone: bool = False
+        self.__doOnReply: Callable[[MessageInternal], None] = None
 
     def is_done(self):
         return self.__isDone
@@ -19,18 +20,18 @@ class SubscribeStreamImpl(StreamBase, SubscribeStream):
         self.__isDone = reply.is_end()
         try:
             if self.__doOnReply:
-                await self.__doOnReply(reply)
+                await RunUtils.waitTry(self.__doOnReply(reply))
         except Exception as e:
             self.on_error(e)
 
-    def then_reply(self, __doOnReply: Callable) -> SubscribeStream:
-        self.__doOnReply = __doOnReply
+    def then_reply(self, doOnReply: Callable[[MessageInternal], None]) -> SubscribeStream:
+        self.__doOnReply = doOnReply
         return self
 
     def then_error(self, onError: Callable[[Exception], None]) -> SubscribeStream:
-        super().then_error_do(onError)
+        self._then_error_do(onError)
         return self
 
     def then_progress(self, onProgress: Callable[[bool, int, int], None]) -> SubscribeStream:
-        super().then_progress_do(onProgress)
+        self._then_progress_do(onProgress)
         return self

{socket.d-2.4.13 → socket.d-2.4.13.1}/socketd/utils/RunUtils.py

@@ -4,10 +4,10 @@ import asyncio
 class RunUtils:
     @staticmethod
     def taskTry(task):
-        if task:
+        if task: #反回对象是异步时，以任务运行
             asyncio.create_task(task)
 
     @staticmethod
     async def waitTry(task):
-        if task:
+        if task: #反回对象是异步时，以等待运行
             await task