socket.d 2.4.10.5__tar.gz → 2.4.10.7__tar.gz

{socket.d-2.4.10.5 → socket.d-2.4.10.7}/PKG-INFO

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

{socket.d-2.4.10.5 → socket.d-2.4.10.7}/setup.py

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

{socket.d-2.4.10.5 → socket.d-2.4.10.7}/socket.d.egg-info/PKG-INFO

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

{socket.d-2.4.10.5 → socket.d-2.4.10.7}/socket.d.egg-info/SOURCES.txt

@@ -97,9 +97,9 @@ socketd/transport/stream/StreamManger.py
 socketd/transport/stream/StreamMangerDefault.py
 socketd/transport/stream/SubscribeStream.py
 socketd/transport/stream/__init__.py
-socketd/transport/utils/AsyncUtil.py
+socketd/transport/utils/AsyncUtils.py
 socketd/transport/utils/CompletableFuture.py
-socketd/transport/utils/StrUtil.py
+socketd/transport/utils/StrUtils.py
 socketd/transport/utils/__init__.py
 socketd/transport/utils/async_api/AtomicRefer.py
 socketd/transport/utils/async_api/__init__.py

{socket.d-2.4.10.5 → socket.d-2.4.10.7}/socketd/broker/BrokerListenerBase.py

@@ -6,7 +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.transport.utils.StrUtil import StrUtil
+from socketd.transport.utils.StrUtils import StrUtils
 
 
 # 经纪人监听器基类（实现玩家封闭管理）
@@ -41,7 +41,7 @@ class BrokerListenerBase(Listener, ABC):
 
     # 获取任意一个玩家会话
     def get_player_any(self, atName: str, requester: Session | None, message: Message | None) -> ClientSession | None:
-        if StrUtil.is_empty(atName):
+        if StrUtils.is_empty(atName):
             return None
 
         if atName.endswith("!"):
@@ -51,7 +51,7 @@ class BrokerListenerBase(Listener, ABC):
             if message is not None:
                 x_hash = message.meta(EntityMetas.META_X_Hash)
 
-            if StrUtil.is_empty(x_hash):
+            if StrUtils.is_empty(x_hash):
                 if requester is None:
                     return LoadBalancer.get_any_by_poll(self.get_player_all(atName))
                 else: # 使用请求者 ip 分流
@@ -63,7 +63,7 @@ class BrokerListenerBase(Listener, ABC):
 
     # 添加玩家会话
     def add_player(self, name: str, session: Session):
-        if StrUtil.is_not_empty(name):
+        if StrUtils.is_not_empty(name):
             tmp: List[Session] = self.__playerSessions.get(name)
             if tmp is None:
                 tmp = [session]
@@ -74,7 +74,7 @@ class BrokerListenerBase(Listener, ABC):
 
     # 移除玩家会话
     def remove_player(self, name: str, session: Session):
-        if StrUtil.is_not_empty(name):
+        if StrUtils.is_not_empty(name):
             tmp: list[Session] = self.get_player_all(name)
             if tmp is not None:
                 tmp.remove(session)

{socket.d-2.4.10.5 → socket.d-2.4.10.7}/socketd/cluster/ClusterClientSession.py

@@ -5,14 +5,14 @@ from socketd.transport.core import Entity
 from socketd.transport.stream.RequestStream import RequestStream
 from socketd.transport.stream.SendStream import SendStream
 from socketd.transport.stream.SubscribeStream import SubscribeStream
-from socketd.transport.utils.StrUtil import StrUtil
+from socketd.transport.utils.StrUtils import StrUtils
 
 
 class ClusterClientSession(ClientSession):
 
     def __init__(self, _sessionSet):
         self.__sessionSet: list[ClientSession] = _sessionSet
-        self.__sessionId = StrUtil.guid()
+        self.__sessionId = StrUtils.guid()
 
     def get_session_all(self) -> list[ClientSession]:
         return self.__sessionSet

{socket.d-2.4.10.5 → socket.d-2.4.10.7}/socketd/cluster/LoadBalancer.py

@@ -2,7 +2,7 @@ from threading import RLock
 from typing import List
 
 from socketd.transport.client.ClientSession import ClientSession
-from socketd.transport.utils.StrUtil import StrUtil
+from socketd.transport.utils.StrUtils import StrUtils
 
 
 class LoadBalancer:
@@ -29,7 +29,7 @@ class LoadBalancer:
     # 根据 hash 获取任意一个
     @staticmethod
     def get_any_by_hash(coll: List[ClientSession], diversion: str) -> ClientSession:
-        return LoadBalancer.get_any(coll, StrUtil.hash_code(diversion))
+        return LoadBalancer.get_any(coll, StrUtils.hash_code(diversion))
 
     # 获取任意一个
     @staticmethod

{socket.d-2.4.10.5 → socket.d-2.4.10.7}/socketd/transport/core/HandshakeDefault.py

@@ -3,7 +3,7 @@ from urllib.parse import urlparse, parse_qsl
 
 from socketd.transport.core.EntityMetas import EntityMetas
 from socketd.transport.core.Message import Message, MessageInternal
-from socketd.transport.utils.StrUtil import StrUtil
+from socketd.transport.utils.StrUtils import StrUtils
 
 
 class Handshake:
@@ -33,7 +33,7 @@ class HandshakeInternal(Handshake):
 class HandshakeDefault(HandshakeInternal):
     def __init__(self, source: MessageInternal):
         linkUrl = source.data_as_string()
-        if StrUtil.is_empty(linkUrl):
+        if StrUtils.is_empty(linkUrl):
             # 兼容旧版本（@deprecated 2.2）
             linkUrl = source.event()
 
@@ -44,7 +44,7 @@ class HandshakeDefault(HandshakeInternal):
         self._paramMap = self._parse_query_string(self._uri.query)
         self._outMetaMap:dict[str,str] = {}
 
-        if StrUtil.is_empty(self._path):
+        if StrUtils.is_empty(self._path):
             self._path = "/" # tcp://1.1.1.1 无路径连接时，path 为空
 
         self._paramMap.update(source.meta_map())
@@ -84,7 +84,7 @@ class HandshakeDefault(HandshakeInternal):
     @staticmethod
     def _parse_query_string(query_string):
         params = {}
-        if StrUtil.is_not_empty(query_string):
+        if StrUtils.is_not_empty(query_string):
             for name, value in parse_qsl(query_string):
                 params[name] = value
         return params

{socket.d-2.4.10.5 → socket.d-2.4.10.7}/socketd/transport/core/IdGenerator.py

@@ -1,9 +1,9 @@
 from typing import Callable
 
-from socketd.transport.utils.StrUtil import StrUtil
+from socketd.transport.utils.StrUtils import StrUtils
 
 IdGenerator = Callable[[None], str]
 
 
 def GuidGenerator():
-    return StrUtil.guid()
+    return StrUtils.guid()

{socket.d-2.4.10.5 → socket.d-2.4.10.7}/socketd/transport/core/entity/FileEntity.py

@@ -1,4 +1,3 @@
-from io import BufferedReader, BytesIO
 from typing import BinaryIO
 
 from socketd.exception.SocketDExecption import SocketDCodecException

{socket.d-2.4.10.5 → socket.d-2.4.10.7}/socketd/transport/core/fragment/FragmentAggregatorDefault.py

@@ -9,7 +9,7 @@ from socketd.exception.SocketDExecption import SocketDException
 
 from .FragmentHolder import FragmentHolder
 from ..entity.MessageBuilder import MessageBuilder
-from ...utils.StrUtil import StrUtil
+from ...utils.StrUtils import StrUtils
 
 
 class FragmentAggregatorDefault(FragmentAggregator):
@@ -22,7 +22,7 @@ class FragmentAggregatorDefault(FragmentAggregator):
         self.__fragmentHolders: list[FragmentHolder] = []
 
         data_length: str = frame.meta(EntityMetas.META_DATA_LENGTH)
-        if StrUtil.is_empty(data_length):
+        if StrUtils.is_empty(data_length):
             raise SocketDException(f"Missing {EntityMetas.META_DATA_LENGTH} meta, event= {frame.event()}")
         self.__data_length = int(data_length)
         self.__data_stream_size = 0

socket.d-2.4.10.7/socketd/transport/core/listener/EventListener.py

@@ -0,0 +1,57 @@
+from typing import Callable, Union, Dict
+
+from socketd.transport.core.Listener import Listener
+from socketd.transport.core.Session import Session
+from socketd.transport.core.Message import Message
+
+
+class EventListener(Listener):
+    """
+    @author bai
+    @since 2.0
+    """
+
+    def __init__(self):
+        self._doOnOpenHandler: Union[Callable[[Session], None], None] = None
+        self._doOnMessageHandler: Union[Callable[[Session, Message], None], None] = None
+        self._doOnCloseHandler: Union[Callable[[Session], None], None] = None
+        self._doOnErrorHandler: Union[Callable[[Session, Exception], None], None] = None
+        self._eventRouteSelector: Union[Dict[str, Callable[[Session, Message], None]], None] = None
+
+    def do_on_open(self, _on_open_handler: Callable[[Session, Message], None]) -> 'EventListener':
+        self._doOnOpenHandler = _on_open_handler
+        return self
+
+    def do_on_message(self, _on_message_handler: Callable[[Session], None]) -> 'EventListener':
+        self._doOnMessageHandler = _on_message_handler
+        return self
+
+    def do_on_close(self, _on_close_handler: Callable[[Session, Exception], None]) -> 'EventListener':
+        self._doOnCloseHandler = _on_close_handler
+        return self
+
+    def do_on_error_handler(self, _on_error_handler: Callable[[Session, Exception], None]) -> 'EventListener':
+        self._doOnErrorHandler = _on_error_handler
+        return self
+
+    def do_on(self, event: str, handler: Callable[[Session, Message], None]):
+        self._eventRouteSelector[event] = handler
+
+    async def on_open(self, session: Session):
+        if self._doOnOpenHandler:
+            self._doOnOpenHandler(session)
+
+    async def on_message(self, session: Session, message: Message):
+        if self._doOnMessageHandler:
+            self._doOnMessageHandler(session, message)
+
+        if message_handler := self._eventRouteSelector.get(message.event()):
+            message_handler(session, message)
+
+    def on_close(self, session: Session):
+        if self._doOnCloseHandler:
+            self._doOnCloseHandler(session)
+
+    def on_error(self, session: Session, error: Exception):
+        if self._doOnErrorHandler:
+            self._doOnErrorHandler(session, error)

socket.d-2.4.10.5/socketd/transport/utils/AsyncUtil.py → socket.d-2.4.10.7/socketd/transport/utils/AsyncUtils.py

@@ -8,7 +8,7 @@ if sys.platform == "win32":
     asyncio.set_event_loop_policy(asyncio.WindowsSelectorEventLoopPolicy())
 
 
-class AsyncUtil(object):
+class AsyncUtils(object):
 
     @staticmethod
     def thread_handler(_loop: asyncio.AbstractEventLoop, fn: asyncio.Task):
@@ -47,7 +47,7 @@ class AsyncUtil(object):
 
             try:
                 future.add_done_callback(
-                    lambda f: AsyncUtil.stop(_loop))
+                    lambda f: AsyncUtils.stop(_loop))
                 _loop.run_forever()
             finally:
                 try:
@@ -81,10 +81,10 @@ class AsyncUtil(object):
                 loop.stop()
 
         if thread:
-            t = Thread(target=AsyncUtil.thread_handler, args=(loop, loop.create_task(_run())))
+            t = Thread(target=AsyncUtils.thread_handler, args=(loop, loop.create_task(_run())))
             t.start()
         elif pool:
-            pool.submit(lambda x: AsyncUtil.thread_handler(*x), (loop, loop.create_task(_run())))
+            pool.submit(lambda x: AsyncUtils.thread_handler(*x), (loop, loop.create_task(_run())))
         return loop
 
     @staticmethod

socket.d-2.4.10.5/socketd/transport/utils/StrUtil.py → socket.d-2.4.10.7/socketd/transport/utils/StrUtils.py

@@ -1,7 +1,7 @@
 import uuid
 
 
-class StrUtil(object):
+class StrUtils(object):
     @staticmethod
     def guid() -> str:
         return str(uuid.uuid4()).replace("-", "")
@@ -12,12 +12,12 @@ class StrUtil(object):
 
     @staticmethod
     def is_not_empty(txt: str) -> bool:
-        return not StrUtil.is_empty(txt)
+        return not StrUtils.is_empty(txt)
 
     @staticmethod
     def hash_code(txt: str) -> int:
         hashCode = 0
-        if StrUtil.is_empty(txt):
+        if StrUtils.is_empty(txt):
             return hashCode
         for char in txt:
             hashCode = (hashCode * 31 + ord(char)) & 0xffffffff  # unsigned

{socket.d-2.4.10.5 → socket.d-2.4.10.7}/socketd_aio_tcp/TcpAioClientConnector.py

@@ -11,7 +11,7 @@ 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.AsyncUtil import AsyncUtil
+from socketd.transport.utils.AsyncUtils import AsyncUtils
 from socketd.transport.utils.CompletableFuture import CompletableFuture
 
 from socketd_aio_tcp.TCPStreamIO import TCPStreamIO
@@ -41,7 +41,7 @@ class TcpAioClientConnector(ClientConnectorBase):
         _port = int(_port.split("/")[0])
         if self.__top is None:
             self._loop = asyncio.new_event_loop()
-            self.__top = AsyncUtil.run_forever(self._loop, daemon=True)
+            self.__top = AsyncUtils.run_forever(self._loop, daemon=True)
         try:
             
             reader = StreamReader(limit=self.get_config().get_read_buffer_size(), loop=loop)

{socket.d-2.4.10.5 → socket.d-2.4.10.7}/socketd_websocket/WsAioClientConnector.py

@@ -10,7 +10,7 @@ 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.transport.client.ClientConnectorBase import ClientConnectorBase
-from socketd.transport.utils.AsyncUtil import AsyncUtil
+from socketd.transport.utils.AsyncUtils import AsyncUtils
 from socketd_websocket.impl.AIOConnect import AIOConnect
 from socketd_websocket.impl.AIOWebSocketClientImpl import AIOWebSocketClientImpl
 
@@ -35,7 +35,7 @@ class WsAioClientConnector(ClientConnectorBase):
             ws_url = ws_url.replace("ws", "wss")
 
         self._loop = asyncio.new_event_loop()
-        self._top = AsyncUtil.run_forever(self._loop, daemon=True)
+        self._top = AsyncUtils.run_forever(self._loop, daemon=True)
 
         try:
             self.__con: AIOConnect = AIOConnect(uri=ws_url,

socket.d-2.4.10.5/socketd/transport/core/listener/EventListener.py

@@ -1,57 +0,0 @@
-from typing import Callable, Union, Dict
-
-from socketd.transport.core.Listener import Listener
-from socketd.transport.core.Session import Session
-from socketd.transport.core.Message import Message
-
-
-class EventListener(Listener):
-    """
-    @author bai
-    @since 2.0
-    """
-
-    def __init__(self):
-        self._do_on_open_handler: Union[Callable[[Session], None], None] = None
-        self._do_on_message_handler: Union[Callable[[Session, Message], None], None] = None
-        self._do_on_close_handler: Union[Callable[[Session], None], None] = None
-        self._do_on_error_handler: Union[Callable[[Session, Exception], None], None] = None
-        self._do_on_message_routing: Union[Dict[str, Callable[[Session, Message], None]], None] = None
-
-    def do_on_open_handler(self, _on_open_handler: Callable[[Session, Message], None]) -> 'EventListener':
-        self._do_on_open_handler = _on_open_handler
-        return self
-
-    def do_on_message_handler(self, _on_message_handler: Callable[[Session], None]) -> 'EventListener':
-        self._do_on_message_handler = _on_message_handler
-        return self
-
-    def do_on_close_handler(self, _on_close_handler: Callable[[Session, Exception], None]) -> 'EventListener':
-        self._do_on_close_handler = _on_close_handler
-        return self
-
-    def do_on_error_handler(self, _on_error_handler: Callable[[Session, Exception], None]) -> 'EventListener':
-        self._do_on_error_handler = _on_error_handler
-        return self
-
-    def do_on(self, event: str, handler: Callable[[Session, Message], None]):
-        self._do_on_message_routing[event] = handler
-
-    async def on_open(self, session: Session):
-        if self._do_on_open_handler:
-            self._do_on_open_handler(session)
-
-    async def on_message(self, session: Session, message: Message):
-        if self._do_on_message_handler:
-            self._do_on_message_handler(session, message)
-
-        if message_handler := self._do_on_message_routing.get(message.event()):
-            message_handler(session, message)
-
-    def on_close(self, session: Session):
-        if self._do_on_close_handler:
-            self._do_on_close_handler(session)
-
-    def on_error(self, session: Session, error: Exception):
-        if self._do_on_error_handler:
-            self._do_on_error_handler(session, error)