socket.d 2.4.14.2__tar.gz → 2.4.14.5__tar.gz

{socket.d-2.4.14.2 → socket.d-2.4.14.5}/PKG-INFO

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

{socket.d-2.4.14.2 → socket.d-2.4.14.5}/setup.py

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

{socket.d-2.4.14.2 → socket.d-2.4.14.5}/socket.d.egg-info/PKG-INFO

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

{socket.d-2.4.14.2 → socket.d-2.4.14.5}/socketd/cluster/ClusterClientSession.py

@@ -50,12 +50,12 @@ class ClusterClientSession(ClientSession):
 
         return sender.send(event, content)
 
-    def send_and_request(self, event: str, content: Entity, timeout: int) -> RequestStream:
+    def send_and_request(self, event: str, content: Entity, timeout: float = 0) -> RequestStream:
         sender = self.get_session_any(None)
 
         return sender.send_and_request(event, content, timeout)
 
-    def send_and_subscribe(self, event: str, content: Entity, timeout: int = 0) -> SubscribeStream:
+    def send_and_subscribe(self, event: str, content: Entity, timeout: float = 0) -> SubscribeStream:
         sender = self.get_session_any(None)
 
         return sender.send_and_subscribe(event, content, timeout)

{socket.d-2.4.14.2 → socket.d-2.4.14.5}/socketd/transport/client/ClientSession.py

@@ -25,11 +25,11 @@ class ClientSession:
         ...
 
     @abc.abstractmethod
-    def send_and_request(self, event: str, content: Entity, timeout: int = 0) -> RequestStream:
+    def send_and_request(self, event: str, content: Entity, timeout: float = 0) -> RequestStream:
         ...
 
     @abc.abstractmethod
-    def send_and_subscribe(self, event: str, content: Entity, timeout: int = 0) -> SubscribeStream:
+    def send_and_subscribe(self, event: str, content: Entity, timeout: float = 0) -> SubscribeStream:
         ...
 
     @abc.abstractmethod

{socket.d-2.4.14.2 → socket.d-2.4.14.5}/socketd/transport/core/impl/SessionDefault.py

@@ -53,20 +53,28 @@ class SessionDefault(SessionBase):
         RunUtils.taskTry(self._channel.send(Frame(Flags.Message, message), stream))
         return stream
 
-    def send_and_request(self, event: str, content: Entity,
-                               timeout: int|None = 100) -> RequestStream:
-
+    def send_and_request(self, event: str, content: Entity, timeout: float|None = 0) -> RequestStream:
         if timeout is None:
-            timeout = 100
+            timeout = 0
+
+        if timeout < 0:
+            timeout = self._channel.get_config().get_stream_timeout()
+
+        if timeout == 0:
+            timeout = self._channel.get_config().get_request_timeout()
 
-        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 = RequestStreamImpl(message.sid(), timeout)
         RunUtils.taskTry(self._channel.send(Frame(Flags.Request, message), stream))
         return stream
 
-    def send_and_subscribe(self, event: str, content: Entity, timeout: int = 0):
+    def send_and_subscribe(self, event: str, content: Entity, timeout: float = 0):
+        if timeout is None:
+            timeout = 0
+
+        if timeout <= 0:
+            timeout = self._channel.get_config().get_stream_timeout()
+
         message = MessageBuilder().sid(self.generate_id()).event(event).entity(content).build()
         stream:SubscribeStream = SubscribeStreamImpl(message.sid(), timeout)
         RunUtils.taskTry(self._channel.send(Frame(Flags.Subscribe, message), stream))

{socket.d-2.4.14.2 → socket.d-2.4.14.5}/socketd/transport/stream/impl/RequestStreamImpl.py

@@ -8,6 +8,7 @@ from socketd.transport.core.Message import MessageInternal
 from socketd.transport.stream.RequestStream import RequestStream
 from socketd.transport.stream.impl.StreamBase import StreamBase
 from socketd.utils.CompletableFuture import CompletableFuture
+from socketd.utils.RunUtils import RunUtils
 
 
 class RequestStreamImpl(StreamBase, RequestStream):
@@ -41,7 +42,7 @@ class RequestStreamImpl(StreamBase, RequestStream):
     def then_reply(self, onReply: Callable[[MessageInternal], None]) -> RequestStream:
         async def _then_reply_do(r: MessageInternal, e: Exception):
             if r:
-                onReply(r)
+                await RunUtils.waitTry(onReply(r))
         self.__future.then_async_callback(_then_reply_do)
         return self
 

{socket.d-2.4.14.2 → socket.d-2.4.14.5}/socketd/transport/stream/impl/SendStreamImpl.py

@@ -16,10 +16,10 @@ class SendStreamImpl(StreamBase, SendStream):
         ...
 
     def then_error(self, onError: Callable[[Exception], None]) -> 'SendStream':
-        super()._then_error_do(onError)
+        self._then_error_do(onError)
         return self
 
 
     def then_progress(self, onProgress: Callable[[bool, int, int], None]) -> 'SendStream':
-        super().then_progress(onProgress)
+        self.then_progress(onProgress)
         return self

{socket.d-2.4.14.2 → socket.d-2.4.14.5}/socketd/transport/stream/impl/StreamBase.py

@@ -11,12 +11,13 @@ from socketd.utils.RunUtils import RunUtils
 
 
 class StreamBase(StreamInternal, ABC):
-    """流接收器基类"""
-
-    def __init__(self, sid: str, demands: int, timeout: int):
-        self.__sid = sid
-        self.__timeout = timeout
-        self.__demands = demands
+    """流接收器基类
+    :param timeout: 超时（毫秒）
+    """
+    def __init__(self, sid: str, demands: int, timeout: float):
+        self.__sid:str = sid
+        self.__timeout:float = timeout
+        self.__demands:int = demands
 
         self.__doOnError: Callable[[Exception], None] = None
         self.__doOnProgress: Callable[[bool, int, int], None] = None
@@ -38,7 +39,7 @@ class StreamBase(StreamInternal, ABC):
     def demands(self) -> int:
         return self.__demands
 
-    def timeout(self):
+    def timeout(self) ->float:
         return self.__timeout
 
     # 保险开始（避免永久没有回调，造成内存不能释放）

{socket.d-2.4.14.2 → socket.d-2.4.14.5}/socketd_websocket/impl/AIOWebSocketServerImpl.py

@@ -1,9 +1,8 @@
 from __future__ import annotations
 import asyncio
-import traceback
 from typing import Optional, Union
 
-from websockets import ConnectionClosedOK
+from websockets import ConnectionClosedOK, ConnectionClosedError, ConnectionClosed
 from websockets.frames import Opcode
 from websockets.server import WebSocketServer, WebSocketServerProtocol
 
@@ -52,15 +51,18 @@ class AIOWebSocketServerImpl(WebSocketServerProtocol):
             channel = ChannelDefault(conn, self.ws_aio_server)
             self.set_attachment(channel)
 
-    async def on_error(self, conn: Union[AIOWebSocketServerImpl, WebSocketServerProtocol], ex: Exception):
-        try:
-            channel: ChannelInternal = conn.get_attachment()
-            if channel is not None:
-                # 有可能未 onOpen，就 onError 了；此时通道未成
-                self.ws_aio_server.get_processor().on_error(channel, ex)
-        except Exception as e:
-            e_msg = traceback.format_exc()
-            log.warning(e_msg)
+    def on_close(self, conn) -> None:
+        channel: ChannelInternal = conn.get_attachment()
+        if channel is not None:
+            # 有可能未 onOpen，就 onClose 了；此时通道未成
+            self.ws_aio_server.get_processor().on_close(channel)
+
+
+    def on_error(self, conn: Union[AIOWebSocketServerImpl, WebSocketServerProtocol], ex: Exception):
+        channel: ChannelInternal = conn.get_attachment()
+        if channel is not None:
+            # 有可能未 onOpen，就 onError 了；此时通道未成
+            self.ws_aio_server.get_processor().on_error(channel, ex)
 
     async def on_message(self, conn: Union[AIOWebSocketServerImpl, WebSocketServerProtocol], path: str):
         """ws_handler"""
@@ -91,9 +93,11 @@ class AIOWebSocketServerImpl(WebSocketServerProtocol):
             except asyncio.CancelledError as e:
                 break
             except ConnectionClosedOK as e:
-                break
+                self.on_close(conn)
+            except ConnectionClosedError as e:
+                self.on_close(conn)
             except Exception as e:
-                await self.on_error(conn, e)
+                self.on_error(conn, e)
 
     # 未签名前，禁止 ping/pong
     async def assert_handshake(self) -> bool: