socket.d 2.4.14.1__tar.gz → 2.4.14.4__tar.gz

{socket.d-2.4.14.1 → socket.d-2.4.14.4}/PKG-INFO

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

{socket.d-2.4.14.1 → socket.d-2.4.14.4}/setup.py

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

{socket.d-2.4.14.1 → socket.d-2.4.14.4}/socket.d.egg-info/PKG-INFO

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

{socket.d-2.4.14.1 → socket.d-2.4.14.4}/socketd/transport/core/impl/ChannelDefault.py

@@ -118,7 +118,7 @@ class ChannelDefault(ChannelBase, ChannelInternal):
 
             if stream.demands() < Constants.DEMANDS_MULTIPLE:
                 # 单收时，内部已经是异步机制
-                await stream.on_reply(frame.message())
+                await RunUtils.waitTry(stream.on_reply(frame.message()))
             else:
                 # 改为异步处理，避免卡死Io线程
                 asyncio.get_running_loop().run_in_executor(self.get_config().get_exchange_executor(),

{socket.d-2.4.14.1 → socket.d-2.4.14.4}/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.1 → socket.d-2.4.14.4}/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.1 → socket.d-2.4.14.4}/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: