socket.d 2.4.11.1__tar.gz → 2.4.12__tar.gz

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

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

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

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

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

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

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

@@ -73,7 +73,6 @@ socketd/transport/core/fragment/__init__.py
 socketd/transport/core/impl/ChannelBase.py
 socketd/transport/core/impl/ChannelDefault.py
 socketd/transport/core/impl/ConfigBase.py
-socketd/transport/core/impl/LogConfig.py
 socketd/transport/core/impl/ProcessorDefault.py
 socketd/transport/core/impl/SessionBase.py
 socketd/transport/core/impl/SessionDefault.py
@@ -102,16 +101,16 @@ 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
-socketd/transport/utils/async_api/AtomicRefer.py
-socketd/transport/utils/async_api/__init__.py
-socketd/transport/utils/sync_api/AtomicRefer.py
-socketd/transport/utils/sync_api/__init__.py
+socketd/utils/AsyncUtils.py
+socketd/utils/CompletableFuture.py
+socketd/utils/LogConfig.py
 socketd/utils/RunUtils.py
 socketd/utils/StrUtils.py
 socketd/utils/__init__.py
+socketd/utils/async_api/AtomicRefer.py
+socketd/utils/async_api/__init__.py
+socketd/utils/sync_api/AtomicRefer.py
+socketd/utils/sync_api/__init__.py
 socketd_aio_tcp/TCPAIOServer.py
 socketd_aio_tcp/TCPStreamIO.py
 socketd_aio_tcp/TcpAIOChannelAssistant.py

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

@@ -14,7 +14,7 @@ from socketd_aio_tcp.TcpAioProvider import TcpAioProvider
 
 
 def version() -> str:
-    return "2.4.11"
+    return "2.4.12"
 
 
 def protocol_version() -> str:

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

@@ -1,5 +1,5 @@
 from abc import ABC, abstractmethod
-from typing import Awaitable, Optional
+from typing import Optional
 
 from socketd.exception.SocketDExecption import SocketDException
 from socketd.transport.client.Client import ClientInternal, Client
@@ -11,7 +11,7 @@ from socketd.transport.core.ChannelAssistant import ChannelAssistant
 from socketd.transport.core.Costants import Constants
 from socketd.transport.core.Session import Session
 from socketd.transport.client.ClientHeartbeatHandler import ClientHeartbeatHandler
-from socketd.transport.core.impl.LogConfig import log
+from socketd.utils.LogConfig import log
 from socketd.transport.core.impl.ProcessorDefault import ProcessorDefault
 from socketd.transport.client.ClientConfig import ClientConfig
 

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

@@ -6,14 +6,14 @@ from socketd.transport.client.Client import ClientInternal
 from socketd.transport.core.Asserts import Asserts
 from socketd.transport.core.ChannelInternal import ChannelInternal
 from socketd.transport.core.Costants import Constants
-from socketd.transport.core.impl.LogConfig import log
+from socketd.utils.LogConfig import log
 from socketd.transport.core.impl.SessionDefault import SessionDefault
 from socketd.transport.stream.Stream import StreamInternal
 from socketd.transport.core.impl.ChannelBase import ChannelBase
 from socketd.transport.client.ClientConnector import ClientConnector
 
 from socketd.transport.client.ClientHeartbeatHandler import ClientHeartbeatHandlerDefault
-from socketd.transport.utils.sync_api.AtomicRefer import AtomicRefer
+from socketd.utils.sync_api.AtomicRefer import AtomicRefer
 
 
 class ClientChannel(ChannelBase):

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

@@ -8,7 +8,7 @@ from socketd.transport.core.ChannelInternal import ChannelInternal
 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.utils.LogConfig import log
 from socketd.transport.stream.Stream import Stream, StreamInternal
 from socketd.transport.stream.StreamManger import StreamManger
 from socketd.transport.core.impl.ChannelBase import ChannelBase
@@ -18,7 +18,7 @@ from socketd.transport.core.EntityMetas import EntityMetas
 from socketd.transport.core.Session import Session
 from socketd.transport.core.impl.SessionDefault import SessionDefault
 from socketd.transport.core.Frame import Frame
-from socketd.transport.utils.CompletableFuture import CompletableFuture
+from socketd.utils.CompletableFuture import CompletableFuture
 from socketd.utils.RunUtils import RunUtils
 
 S = TypeVar("S")

{socket.d-2.4.11.1 → socket.d-2.4.12}/socketd/transport/core/impl/ConfigBase.py

@@ -13,7 +13,7 @@ from socketd.transport.core.codec.CodecDefault import CodecDefault
 from socketd.transport.core.Costants import Constants
 from socketd.transport.core.fragment.FragmentHandlerDefault import FragmentHandlerDefault
 
-from socketd.transport.core.impl.LogConfig import logger
+from socketd.utils.LogConfig import logger
 from socketd.transport.stream.StreamManger import StreamManger
 from socketd.transport.stream.StreamMangerDefault import StreamMangerDefault
 

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

@@ -10,7 +10,7 @@ from socketd.transport.core.Costants import Constants
 from socketd.transport.core.Flags import Flags
 from socketd.transport.core.EntityMetas import EntityMetas
 from socketd.transport.core.Frame import Frame
-from socketd.transport.core.impl.LogConfig import log
+from socketd.utils.LogConfig import log
 from socketd.transport.core.listener.SimpleListener import SimpleListener
 from socketd.transport.stream.Stream import StreamInternal
 from socketd.utils.RunUtils import RunUtils
@@ -171,10 +171,16 @@ class ProcessorDefault(Processor, ABC):
         await channel.close(code)
 
     def on_error(self, channel: ChannelInternal, error):
-        RunUtils.taskTry(self.listener.on_error(channel.get_session(), error))
+        RunUtils.taskTry(self.on_error_internal(channel, error))
+
+    async def on_error_internal(self, channel: ChannelInternal, error):
+        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)
 
     def do_close_notice(self, channel: ChannelInternal):
-         RunUtils.taskTry(self.do_close_notice_internal(channel))
+        RunUtils.taskTry(self.do_close_notice_internal(channel))
 
     async def do_close_notice_internal(self, channel: ChannelInternal):
         try:

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

@@ -6,7 +6,7 @@ from socketd.transport.core.Entity import Reply
 
 class RequestStream(Stream):
     @abstractmethod
-    async def get(self) -> Reply:
+    async def waiter(self) -> Reply:
         ...
 
     @abstractmethod

{socket.d-2.4.11.1 → socket.d-2.4.12}/socketd/transport/stream/impl/RequestStreamImpl.py

@@ -7,7 +7,7 @@ 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
+from socketd.utils.CompletableFuture import CompletableFuture
 
 
 class RequestStreamImpl(StreamBase, RequestStream):
@@ -26,7 +26,7 @@ class RequestStreamImpl(StreamBase, RequestStream):
         except Exception as _e:
             raise SocketDException(f"Request failed, sid= sid={self.sid()} {str(_e)}")
 
-    async def get(self) -> Reply:
+    async def waiter(self) -> Reply:
         if self.__future.done():
             return self.__future.get_result()
         return await self.__await__()

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

@@ -6,7 +6,7 @@ from socketd.exception.SocketDExecption import SocketDTimeoutException
 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
+from socketd.utils.CompletableFuture import CompletableFuture
 
 
 class StreamBase(StreamInternal, ABC):

{socket.d-2.4.11.1/socketd/transport → socket.d-2.4.12/socketd}/utils/CompletableFuture.py

@@ -1,7 +1,7 @@
 import asyncio
 import functools
 from threading import Lock
-from typing import Generic, TypeVar, Callable, Union, Coroutine
+from typing import Generic, TypeVar, Callable
 
 from loguru import logger
 

{socket.d-2.4.11.1 → socket.d-2.4.12}/socketd_aio_tcp/TCPAIOServer.py

@@ -9,11 +9,11 @@ from socketd.transport.core.Costants import Constants
 from socketd.transport.core.Flags import Flags
 from socketd.transport.core.Frame import Frame
 from socketd.transport.core.impl.ChannelDefault import ChannelDefault
-from socketd.transport.core.impl.LogConfig import log
+from socketd.utils.LogConfig import log
 from socketd.transport.server.ServerBase import ServerBase
 from socketd.transport.server.ServerConfig import ServerConfig
 
-from socketd.transport.utils.async_api.AtomicRefer import AtomicRefer
+from socketd.utils.async_api.AtomicRefer import AtomicRefer
 from .TCPStreamIO import TCPStreamIO
 
 from .TcpAIOChannelAssistant import TcpAIOChannelAssistant

{socket.d-2.4.11.1 → socket.d-2.4.12}/socketd_aio_tcp/TcpAioClientConnector.py

@@ -10,9 +10,9 @@ from socketd.transport.client.ClientHandshakeResult import ClientHandshakeResult
 from socketd.transport.core.Flags import Flags
 from socketd.transport.core.Frame import Frame
 from socketd.transport.core.impl.ChannelDefault import ChannelDefault
-from socketd.transport.core.impl.LogConfig import log
-from socketd.transport.utils.AsyncUtils import AsyncUtils
-from socketd.transport.utils.CompletableFuture import CompletableFuture
+from socketd.utils.LogConfig import log
+from socketd.utils.AsyncUtils import AsyncUtils
+from socketd.utils.CompletableFuture import CompletableFuture
 
 from socketd_aio_tcp.TCPStreamIO import TCPStreamIO
 

{socket.d-2.4.11.1 → socket.d-2.4.12}/socketd_websocket/WsAioClientConnector.py

@@ -8,9 +8,9 @@ from socketd.transport.client.Client import ClientInternal
 from socketd.transport.client.ClientHandshakeResult import ClientHandshakeResult
 from socketd.transport.core.Channel import Channel
 from socketd.transport.core.Costants import Constants
-from socketd.transport.core.impl.LogConfig import log, logger
+from socketd.utils.LogConfig import log, logger
 from socketd.transport.client.ClientConnectorBase import ClientConnectorBase
-from socketd.transport.utils.AsyncUtils import AsyncUtils
+from socketd.utils.AsyncUtils import AsyncUtils
 from socketd_websocket.impl.AIOConnect import AIOConnect
 from socketd_websocket.impl.AIOWebSocketClientImpl import AIOWebSocketClientImpl
 

{socket.d-2.4.11.1 → socket.d-2.4.12}/socketd_websocket/WsAioServer.py

@@ -10,7 +10,7 @@ from socketd.transport.server.ServerConfig import ServerConfig
 from socketd_websocket.impl.AIOServe import AIOServe
 from socketd_websocket.impl.AIOWebSocketServerImpl import AIOWebSocketServerImpl
 
-from socketd.transport.core.impl.LogConfig import logger, log
+from socketd.utils.LogConfig import logger, log
 
 
 class WsAioServer(ServerBase):

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

@@ -7,13 +7,13 @@ from websockets.uri import WebSocketURI
 
 from socketd.exception.SocketDExecption import SocketDConnectionException
 from socketd.transport.client.ClientHandshakeResult import ClientHandshakeResult
-from socketd.transport.core.impl.LogConfig import log
+from socketd.utils.LogConfig import log
 from socketd.transport.core.impl.ChannelDefault import ChannelDefault
 from websockets import WebSocketClientProtocol, Origin, Subprotocol, HeadersLike, ConnectionClosedOK
 
 from socketd.transport.core.Flags import Flags
 from socketd.transport.core.Frame import Frame
-from socketd.transport.utils.CompletableFuture import CompletableFuture
+from socketd.utils.CompletableFuture import CompletableFuture
 from socketd_websocket import WsAioClient
 
 

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

@@ -8,7 +8,7 @@ from websockets.server import WebSocketServer, WebSocketServerProtocol
 
 from socketd.transport.core.Channel import Channel
 from socketd.transport.core.ChannelInternal import ChannelInternal
-from socketd.transport.core.impl.LogConfig import log
+from socketd.utils.LogConfig import log
 from socketd.transport.core.impl.ChannelDefault import ChannelDefault
 from socketd.transport.core.Flags import Flags
 from socketd.transport.core.Frame import Frame