socket.d 2.4.12__tar.gz → 2.4.13.1__tar.gz

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

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

{socket.d-2.4.12 → 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.12',
+    version='2.4.13.1',
     description='@noear/socket.d python project',
     author='noear,bai',
     url='https://socketd.noear.org/',

{socket.d-2.4.12 → 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.12
+Version: 2.4.13.1
 Summary: @noear/socket.d python project
 Home-page: https://socketd.noear.org/
 Author: noear,bai

{socket.d-2.4.12 → socket.d-2.4.13.1}/socket.d.egg-info/SOURCES.txt

@@ -104,6 +104,7 @@ socketd/transport/stream/impl/__init__.py
 socketd/utils/AsyncUtils.py
 socketd/utils/CompletableFuture.py
 socketd/utils/LogConfig.py
+socketd/utils/MapUtils.py
 socketd/utils/RunUtils.py
 socketd/utils/StrUtils.py
 socketd/utils/__init__.py

{socket.d-2.4.12 → socket.d-2.4.13.1}/socketd/SocketD.py

@@ -1,6 +1,6 @@
 from typing import Dict
 
-import socketd.cluster.ClusterClient as ClusterClient
+from socketd.cluster.ClusterClient import ClusterClient
 from socketd.transport.client.ClientConfig import ClientConfig
 from socketd.transport.client.Client import Client
 from socketd.transport.client.ClientProvider import ClientProvider
@@ -14,7 +14,7 @@ from socketd_aio_tcp.TcpAioProvider import TcpAioProvider
 
 
 def version() -> str:
-    return "2.4.12"
+    return "2.4.13"
 
 
 def protocol_version() -> str:
@@ -81,7 +81,7 @@ def create_client_or_null(config: ClientConfig) -> Client | None:
 
 
 def create_cluster_client(*urls) -> Client:
-    return ClusterClient(*urls)
+    return ClusterClient(urls)
 
 
 # Initialize the client and server factory maps

{socket.d-2.4.12 → socket.d-2.4.13.1}/socketd/broker/BrokerListener.py

@@ -90,4 +90,4 @@ class BrokerListener(BrokerListenerBase):
 
     def on_error(self, session: Session, error):
         ...
-        # log.warn("Broker error", error)
+        # log.warning("Broker error", error)

{socket.d-2.4.12 → socket.d-2.4.13.1}/socketd/broker/BrokerListenerBase.py

@@ -6,6 +6,7 @@ from socketd.transport.core.EntityMetas import EntityMetas
 from socketd.transport.core.Listener import Listener
 from socketd.transport.core.Message import Message
 from socketd.transport.core.Session import Session
+from socketd.utils.MapUtils import MapUtils
 from socketd.utils.StrUtils import StrUtils
 
 
@@ -79,4 +80,4 @@ class BrokerListenerBase(Listener, ABC):
             if tmp is not None:
                 tmp.remove(session)
 
-        self.__sessionAll.pop(session.session_id())
+        MapUtils.remove(self.__sessionAll, session.session_id())

{socket.d-2.4.12 → socket.d-2.4.13.1}/socketd/cluster/ClusterClient.py

@@ -1,5 +1,5 @@
 import asyncio
-from typing import Optional, List, Awaitable, Any
+from typing import List
 
 from socketd import SocketD
 from socketd.cluster.ClusterClientSession import ClusterClientSession
@@ -14,8 +14,8 @@ from socketd.transport.client.ClientHeartbeatHandler import ClientHeartbeatHandl
 
 class ClusterClient(Client):
 
-    def __init__(self, *serverUrls):
-        self.__serverUrls: Optional[tuple[Any, ...]] = serverUrls
+    def __init__(self, serverUrls:tuple[str]):
+        self.__serverUrls:tuple[str] = serverUrls
 
         self.__connectHandler: ClientConnectHandler = None
         self.__heartbeatHandler: ClientHeartbeatHandler = None
@@ -39,11 +39,11 @@ class ClusterClient(Client):
         self.__listener = listener
         return self
 
-    def open(self) -> Awaitable[ClientSession]:
-        return self._open_do(False)
+    async def open(self) -> ClientSession:
+        return await self._open_do(False)
 
-    def open_or_throw(self) -> Awaitable[ClientSession]:
-        return self._open_do(True)
+    async def open_or_throw(self) -> ClientSession:
+        return await self._open_do(True)
 
     async def _open_do(self, is_throw):
         sessions: List[Session] = []
@@ -69,7 +69,8 @@ class ClusterClient(Client):
                 else:
                     client.get_config().exchange_executor(exchangeExecutor)
 
-                sessions.extend(await asyncio.gather(*[client.open_or_throw() if is_throw else client.open()]))
+                sesssion = await (client.open_or_throw() if is_throw else client.open())
+                sessions.append(sesssion)
         return ClusterClientSession(sessions)
 
 

{socket.d-2.4.12 → socket.d-2.4.13.1}/socketd/exception/SocketDExecption.py

@@ -1,3 +1,6 @@
+from socketd.transport.core.Message import Message
+
+
 class SocketDException(RuntimeError):
 
     def __init__(self, message):
@@ -10,7 +13,11 @@ class SocketDException(RuntimeError):
 
 class SocketDAlarmException(SocketDException):
     """ 告警"""
-    pass
+    def __init__(self, alarm:Message):
+        super().__init__(alarm.data_as_string())
+        self.__alarm = alarm
+    def get_alarm(self):
+        return self.__alarm
 
 
 class SocketDChannelException(SocketDException):

{socket.d-2.4.12 → socket.d-2.4.13.1}/socketd/transport/client/ClientChannel.py

@@ -1,4 +1,5 @@
 import asyncio
+import traceback
 from asyncio import Future
 
 from socketd.exception.SocketDExecption import SocketDException, SocketDChannelException
@@ -40,7 +41,8 @@ class ClientChannel(ChannelBase):
             if not self.__heartbeatScheduledFuture.done():
                 self.__heartbeatScheduledFuture.cancel()
         except Exception as e:
-            log.warning(e)
+            e_msg = traceback.format_exc()
+            log.warning(e_msg)
 
     async def __heartbeatScheduled(self) -> None:
         while True:

{socket.d-2.4.12 → socket.d-2.4.13.1}/socketd/transport/core/Session.py

@@ -48,6 +48,10 @@ class Session(ClientSession):
     def attr_has(self, name: str) -> bool:
         ...
 
+    @abc.abstractmethod
+    def attr_del(self, name: str):
+        ...
+
     @abc.abstractmethod
     def attr(self, name: str) -> Union[None, Any]:
         ...

{socket.d-2.4.12 → socket.d-2.4.13.1}/socketd/transport/core/codec/CodecDefault.py

@@ -32,16 +32,15 @@ class CodecDefault(Codec):
             # sid
             sidB: bytes = frame.message().sid().encode(self.config.get_charset())
             # event
-            event: bytes = frame.message().event().encode(self.config.get_charset())
+            eventB: bytes = frame.message().event().encode(self.config.get_charset())
             # metaString
             metaStringB: bytes = frame.message().entity().meta_string().encode(self.config.get_charset())
 
-            # length (flag + sid + event + metaString + data + int.bytes + \n*3)
-            len1 = len(sidB) + len(event) + len(
-                metaStringB) + frame.message().entity().data_size() + 1 * 3 + 2 * 4
+            # length (len[int] + flag[int] + sid + event + metaString + data + \n*3)
+            len1 = 4 + 4 + len(sidB) + len(eventB) + len(metaStringB) + frame.message().data_size() + 2 * 3
 
             Asserts.assert_size("sid", len(sidB), Constants.MAX_SIZE_SID)
-            Asserts.assert_size("event", len(event), Constants.MAX_SIZE_EVENT)
+            Asserts.assert_size("event", len(eventB), Constants.MAX_SIZE_EVENT)
             Asserts.assert_size("metaString", len(metaStringB), Constants.MAX_SIZE_META_STRING)
             Asserts.assert_size("data", frame.message().entity().data_size(), Constants.MAX_SIZE_DATA)
 
@@ -58,7 +57,7 @@ class CodecDefault(Codec):
             target.put_char(10) #'\n'
 
             # event
-            target.put_bytes(event)
+            target.put_bytes(eventB)
             target.put_char(10)
 
             # metaString

{socket.d-2.4.12 → socket.d-2.4.13.1}/socketd/transport/core/entity/EntityDefault.py

@@ -6,6 +6,7 @@ from typing import Any, Optional, BinaryIO
 from socketd.transport.core.Entity import Entity
 from socketd.transport.core.Costants import Constants
 from socketd.transport.core.EntityMetas import EntityMetas
+from socketd.utils.MapUtils import MapUtils
 
 
 class EntityDefault(Entity):
@@ -66,13 +67,13 @@ class EntityDefault(Entity):
         if val:
             self.meta_map()[name] = val
         else:
-            self.meta_map().pop(name)
+            MapUtils.remove(self.meta_map(), name)
 
         self._meta_stringChanged = True
         return self
 
     def meta_del(self, name:str):
-        self.meta_map().pop(name)
+        MapUtils.remove(self.meta_map(), name)
         self._meta_stringChanged = True
         return self
 

{socket.d-2.4.12 → socket.d-2.4.13.1}/socketd/transport/core/entity/MessageDefault.py

@@ -78,4 +78,7 @@ class MessageDefault(MessageInternal):
         if self._entity:
             self._entity.release()
 
+    def __str__(self):
+        return f"Message(sid='{self._sid}', event='{self._event}', entity='{self._entity}')"
+
 

{socket.d-2.4.12 → socket.d-2.4.13.1}/socketd/transport/core/fragment/FragmentAggregatorDefault.py

@@ -6,6 +6,7 @@ from socketd.transport.core.Message import MessageInternal
 from socketd.transport.core.EntityMetas import EntityMetas
 from socketd.transport.core.FragmentAggregator import FragmentAggregator
 from socketd.exception.SocketDExecption import SocketDException
+from socketd.utils.MapUtils import MapUtils
 
 from .FragmentHolder import FragmentHolder
 from ..entity.MessageBuilder import MessageBuilder
@@ -49,7 +50,7 @@ class FragmentAggregatorDefault(FragmentAggregator):
             dataBuffer.write(fragment.message.data().getvalue())
 
         entity = EntityDefault().meta_map_put(self.__main.meta_map()).data_set(dataBuffer)
-        entity.meta_map().pop(EntityMetas.META_DATA_FRAGMENT_IDX)
+        MapUtils.remove(entity.meta_map(), EntityMetas.META_DATA_FRAGMENT_IDX)
 
         return Frame(self.__main.flag(),
                      MessageBuilder()

{socket.d-2.4.12 → socket.d-2.4.13.1}/socketd/transport/core/impl/ChannelBase.py

@@ -10,6 +10,7 @@ from socketd.transport.core.Frames import Frames
 from socketd.transport.core.Config import Config
 from socketd.transport.core.HandshakeDefault import HandshakeInternal
 from socketd.transport.core.Message import Message
+from socketd.utils.MapUtils import MapUtils
 
 
 class ChannelBase(Channel, ABC):
@@ -17,7 +18,7 @@ class ChannelBase(Channel, ABC):
         self.config = config
 
         self.handshake: HandshakeInternal = None
-        self.__attachments = {}
+        self.__attachments:dict = {}
 
         self.__lock: threading.Lock = threading.Lock()
         self.__loop: Optional[asyncio.AbstractEventLoop] = None
@@ -45,7 +46,7 @@ class ChannelBase(Channel, ABC):
 
     def put_attachment(self, name, val):
         if val is None:
-            self.__attachments.pop(name)
+            MapUtils.remove(self.__attachments, name)
         else:
             self.__attachments[name] = val
 

{socket.d-2.4.12 → socket.d-2.4.13.1}/socketd/transport/core/impl/ChannelDefault.py

@@ -1,5 +1,6 @@
 import asyncio
 import time
+import traceback
 from typing import TypeVar, Optional
 
 from socketd.transport.core import Entity
@@ -170,8 +171,8 @@ class ChannelDefault(ChannelBase, ChannelInternal):
                     await RunUtils.waitTry(self._assistant.close(self._source))
                     log.debug(f"{self.get_config().get_role_name()} channel closed, sessionId={self.get_session().session_id()}")
         except Exception as e:
-            log.warning(f"{self.get_config().get_role_name()} channel close error, "
-                        f"sessionId={self.get_session().session_id()} : {e}")
+            e_msg = traceback.format_exc()
+            log.warning(f"{self.get_config().get_role_name()} channel close error, sessionId={self.get_session().session_id()} \n{e_msg}")
 
         if code > Constants.CLOSE1000_PROTOCOL_CLOSE_STARTING:
             self.on_close_do()

{socket.d-2.4.12 → socket.d-2.4.13.1}/socketd/transport/core/impl/ProcessorDefault.py

@@ -1,3 +1,4 @@
+import traceback
 from abc import ABC
 from typing import Optional
 
@@ -63,8 +64,7 @@ class ProcessorDefault(Processor, ABC):
                 if frame.flag() == Flags.Close:
                     raise SocketDConnectionException("Connection request was rejected")
 
-                log.warning("{} channel handshake is None, sessionId={}", channel.get_config().get_role_name(),
-                                 channel.get_session().session_id())
+                log.warning(f"{channel.get_config().get_role_name()} channel handshake is None, sessionId={channel.get_session().session_id()}")
                 return
 
             # 更新最后活动时间
@@ -147,10 +147,11 @@ class ProcessorDefault(Processor, ABC):
 
     async def on_open_do(self, channel: ChannelInternal):
         try:
-            await self.listener.on_open(channel.get_session())
+            await RunUtils.waitTry(self.listener.on_open(channel.get_session()))
             channel.do_open_future(True, None)
         except Exception as e:
-            log.warning("{} channel listener onOpen error", channel.get_config().get_role_name(), e)
+            e_msg = traceback.format_exc()
+            log.warning(f"{channel.get_config().get_role_name()} channel listener onOpen error \n{e_msg}")
             channel.do_open_future(False, e)
 
     def on_message(self, channel: ChannelInternal, message: Message):
@@ -160,7 +161,8 @@ class ProcessorDefault(Processor, ABC):
         try:
             await self.listener.on_message(channel.get_session(), message)
         except Exception as e:
-            log.warning("{} channel listener onMessage error", channel.get_config().get_role_name(), e)
+            e_msg = traceback.format_exc()
+            log.warning(f"{channel.get_config().get_role_name()} channel listener onMessage error \n{e_msg}")
             self.on_error(channel, e)
 
     def on_close(self, channel: ChannelInternal):
@@ -177,7 +179,8 @@ class ProcessorDefault(Processor, ABC):
         try:
             await RunUtils.waitTry(self.listener.on_error(channel.get_session(), error))
         except Exception as e:
-            log.warning("{} channel listener onError error", channel.get_config().get_role_name(), e)
+            e_msg = traceback.format_exc()
+            log.warning(f"{channel.get_config().get_role_name()} channel listener onError error \n{e_msg}")
 
     def do_close_notice(self, channel: ChannelInternal):
         RunUtils.taskTry(self.do_close_notice_internal(channel))

{socket.d-2.4.12 → socket.d-2.4.13.1}/socketd/transport/core/impl/SessionBase.py

@@ -2,6 +2,7 @@ from abc import ABC
 from typing import Any, Dict
 from socketd.transport.core.Session import Session
 from socketd.transport.core.Channel import Channel
+from socketd.utils.MapUtils import MapUtils
 
 
 class SessionBase(Session, ABC):
@@ -22,6 +23,10 @@ class SessionBase(Session, ABC):
         else:
             return self._attrMap.__contains__(name)
 
+    def attr_del(self, name: str):
+        if self._attrMap is not None:
+            MapUtils.remove(self._attrMap, name)
+
     def attr(self, name: str) -> Any:
         if self._attrMap is None:
             return None

{socket.d-2.4.12 → socket.d-2.4.13.1}/socketd/transport/core/impl/SessionDefault.py

@@ -1,3 +1,4 @@
+import traceback
 from typing import Optional
 
 from socketd.transport.core.entity.MessageBuilder import MessageBuilder
@@ -14,11 +15,10 @@ from socketd.transport.stream.SendStream import SendStream
 
 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.LogConfig import log
 from socketd.utils.RunUtils import RunUtils
 
 
@@ -54,7 +54,10 @@ class SessionDefault(SessionBase):
         return stream
 
     def send_and_request(self, event: str, content: Entity,
-                               timeout: int = 100) -> RequestStream:
+                               timeout: int|None = 100) -> RequestStream:
+
+        if timeout is None:
+            timeout = 100
 
         if timeout < 100:
             timeout = self._channel.get_config().get_request_timeout() / 1000
@@ -80,7 +83,7 @@ class SessionDefault(SessionBase):
         await self._channel.send(Frame(Flags.ReplyEnd, message), None)
 
     async def preclose(self):
-        logger.debug(
+        log.debug(
             f"{self._channel.get_config().get_role_name()} session close starting, sessionId={self.session_id()}")
         if self._channel.is_valid():
             await self._channel.send_close(Constants.CLOSE1000_PROTOCOL_CLOSE_STARTING)
@@ -90,7 +93,8 @@ class SessionDefault(SessionBase):
             try:
                 await self._channel.send_close(Constants.CLOSE1001_PROTOCOL_CLOSE)
             except Exception as e:
-                logger.warning(f" {self._channel.get_config().get_role_name()} channel send_close error {e}")
+                e_msg = traceback.format_exc()
+                log.warning(f" {self._channel.get_config().get_role_name()} channel send_close error \n{e_msg}")
         await self._channel.close(Constants.CLOSE2009_USER)
 
     def param(self, name: str):

{socket.d-2.4.12 → 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.12 → socket.d-2.4.13.1}/socketd/transport/core/listener/RouteSelectorDefault.py

@@ -2,19 +2,20 @@ from typing import Dict
 
 from socketd.transport.core import Listener
 from socketd.transport.core.listener.RouteSelector import RouteSelector
+from socketd.utils.MapUtils import MapUtils
 
 
 class RouteSelectorDefault(RouteSelector):
     def __init__(self):
-        __inner:Dict[str, Listener] = {}
+        self._map:Dict[str, Listener] = {}
     def select(self, route: str) -> Listener:
-        return self.__inner.get(route)
+        return self._map.get(route)
 
     def put(self, route: str, target: Listener):
-        self.__inner.put(route, target)
+        self._map.put(route, target)
 
     def remove(self, route: str):
-        self.__inner.pop(route)
+        MapUtils.remove(self._map, route)
 
     def size(self) -> int:
-        return self.__inner.__len__()
+        return self._map.__len__()

{socket.d-2.4.12 → socket.d-2.4.13.1}/socketd/transport/stream/RequestStream.py

@@ -10,7 +10,7 @@ class RequestStream(Stream):
         ...
 
     @abstractmethod
-    def then_error(self, onError: Callable[[Exception], None]) -> 'SendStream':
+    def then_error(self, onError: Callable[[Exception], None]) -> 'RequestStream':
         """
         异常发生
         :param onError: 当异常发生时执行的函数，接受一个异常参数
@@ -18,7 +18,7 @@ class RequestStream(Stream):
         ...
 
     @abstractmethod
-    def then_progress(self, onProgress: Callable[[bool, int, int], None]) -> 'SendStream':
+    def then_progress(self, onProgress: Callable[[bool, int, int], None]) -> 'RequestStream':
         """
         进度发生时
         :param onProgress (isSend, val, max)
@@ -26,7 +26,7 @@ class RequestStream(Stream):
         ...
 
     @abstractmethod
-    def then_reply(self, onReply: Callable[[Reply], None]) -> 'SendStream':
+    def then_reply(self, onReply: Callable[[Reply], None]) -> 'RequestStream':
         """
         答复发生时
         """

{socket.d-2.4.12 → socket.d-2.4.13.1}/socketd/transport/stream/StreamMangerDefault.py

@@ -2,6 +2,7 @@ import logging
 
 from socketd.transport.stream.Stream import StreamInternal
 from socketd.transport.stream.StreamManger import StreamManger
+from socketd.utils.MapUtils import MapUtils
 
 logger = logging.getLogger(__name__)
 
@@ -27,7 +28,7 @@ class StreamMangerDefault(StreamManger):
             stream.insurance_start(self, stream_timeout)
 
     def remove_stream(self, sid):
-        stream: StreamInternal = self.stream_map.pop(sid, None)
+        stream: StreamInternal = MapUtils.remove(self.stream_map, sid)
         if stream:
             stream.insurance_cancel()
             logger.debug(f"{self.config.get_role_name()} stream removed, sid={sid}")

{socket.d-2.4.12 → 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.12 → 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.12 → 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):
@@ -17,7 +18,6 @@ class StreamBase(StreamInternal, ABC):
         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
 
@@ -29,10 +29,10 @@ class StreamBase(StreamInternal, ABC):
     def is_done(self):
         return True
 
-    def then_error_do(self, onError: Callable[[Exception], None]):
-        self.__onError = onError
+    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,12 +63,12 @@ class StreamBase(StreamInternal, ABC):
         ...
 
     def on_error(self, error: Exception):
-        if error:
-            self.__doOnError(error)
+        if error and self.__doOnError:
+            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.12 → 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.12 → socket.d-2.4.13.1}/socketd/utils/CompletableFuture.py

@@ -3,7 +3,7 @@ import functools
 from threading import Lock
 from typing import Generic, TypeVar, Callable
 
-from loguru import logger
+from socketd.utils.LogConfig import log
 
 T = TypeVar('T')
 
@@ -14,7 +14,7 @@ class CompletableFuture(Generic[T]):
         if loop is None:
             loop = asyncio.get_running_loop()
         if _future and not asyncio.iscoroutine(_future):
-            logger.warning("{name}对象不是协程对象", name=_future.__name__)
+            log.warning("{name} invalid coroutine object", name=_future.__name__)
             return
         self._future: asyncio.Task = loop.create_task(_future) if _future else loop.create_future()
         self._lock = Lock()

{socket.d-2.4.12 → socket.d-2.4.13.1}/socketd/utils/LogConfig.py

@@ -8,5 +8,5 @@ from loguru import logger as _logger
 logger = logging.getLogger("socketD")
 # 异步默认日志
 logging.getLogger("asyncio").setLevel(logging.WARNING)
-# 日志用这个
-log = _logger.opt(colors=True)
+# 日志用这个（为能用 True，否则格式化异常时会出错）
+log = _logger.opt(colors=False)

socket.d-2.4.13.1/socketd/utils/MapUtils.py

@@ -0,0 +1,7 @@
+class MapUtils(object):
+    @staticmethod
+    def remove(map:dict, name:str) -> object:
+        _tmp = map.get(name)
+        if _tmp is not None:
+            map.pop(name)
+        return _tmp

{socket.d-2.4.12 → 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

{socket.d-2.4.12 → socket.d-2.4.13.1}/socketd_websocket/impl/AIOWebSocketClientImpl.py

@@ -1,7 +1,7 @@
 import asyncio
+import traceback
 from asyncio import CancelledError
 from typing import Optional, Sequence, List
-from loguru import logger
 from websockets.extensions import ClientExtensionFactory
 from websockets.uri import WebSocketURI
 
@@ -58,7 +58,8 @@ class AIOWebSocketClientImpl(WebSocketClientProtocol):
             try:
                 await self.on_message()
             except Exception as e:
-                log.warning(e)
+                e_msg = traceback.format_exc()
+                log.warning(e_msg)
                 break
 
     def connection_open(self) -> None:
@@ -69,7 +70,6 @@ class AIOWebSocketClientImpl(WebSocketClientProtocol):
         super().connection_open()
         self._handler_future = self.loop.create_task(self._handler())
 
-    @logger.catch
     async def on_open(self):
         """开始建立连接"""
         try:
@@ -118,10 +118,11 @@ class AIOWebSocketClientImpl(WebSocketClientProtocol):
             log.debug(c)
             raise c
         except SocketDConnectionException as s:
+            s_msg = traceback.format_exc()
             self.handshake_future.accept(ClientHandshakeResult(self.channel, s))
-            logger.warning(s)
+            log.warning(s_msg)
         except ConnectionClosedOK as e:
-            logger.info(e)
+            log.info(e)
         except Exception as e:
             self.on_error(e)
 

{socket.d-2.4.12 → socket.d-2.4.13.1}/socketd_websocket/impl/AIOWebSocketServerImpl.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 import asyncio
+import traceback
 from typing import Optional, Union
 
 from websockets import ConnectionClosedOK
@@ -58,7 +59,8 @@ class AIOWebSocketServerImpl(WebSocketServerProtocol):
                 # 有可能未 onOpen，就 onError 了；此时通道未成
                 self.ws_aio_server.get_processor().on_error(channel, ex)
         except Exception as e:
-            log.warning(e)
+            e_msg = traceback.format_exc()
+            log.warning(e_msg)
 
     async def on_message(self, conn: Union[AIOWebSocketServerImpl, WebSocketServerProtocol], path: str):
         """ws_handler"""