socket.d 2.4.10.6__tar.gz → 2.4.11__tar.gz

{socket.d-2.4.10.6 → socket.d-2.4.11}/PKG-INFO

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

{socket.d-2.4.10.6 → socket.d-2.4.11}/setup.py

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

{socket.d-2.4.10.6 → socket.d-2.4.11}/socket.d.egg-info/PKG-INFO

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

{socket.d-2.4.10.6 → socket.d-2.4.11}/socket.d.egg-info/SOURCES.txt

@@ -80,8 +80,9 @@ socketd/transport/core/impl/SessionDefault.py
 socketd/transport/core/impl/__init__.py
 socketd/transport/core/listener/EventListener.py
 socketd/transport/core/listener/PathListener.py
-socketd/transport/core/listener/PathMapper.py
 socketd/transport/core/listener/PipelineListener.py
+socketd/transport/core/listener/RouteSelector.py
+socketd/transport/core/listener/RouteSelectorDefault.py
 socketd/transport/core/listener/SimpleListener.py
 socketd/transport/core/listener/__init__.py
 socketd/transport/server/Server.py
@@ -97,14 +98,16 @@ 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/__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/RunUtils.py
+socketd/utils/StrUtils.py
+socketd/utils/__init__.py
 socketd_aio_tcp/TCPAIOServer.py
 socketd_aio_tcp/TCPStreamIO.py
 socketd_aio_tcp/TcpAIOChannelAssistant.py

{socket.d-2.4.10.6 → socket.d-2.4.11}/socketd/SocketD.py

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

{socket.d-2.4.10.6 → socket.d-2.4.11}/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.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.6 → socket.d-2.4.11}/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.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.6 → socket.d-2.4.11}/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.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.6 → socket.d-2.4.11}/socketd/transport/core/Codec.py

@@ -40,6 +40,9 @@ class CodecWriter(ABC):
     @abstractmethod
     def put_int(self, _num: int): ...
 
+    @abstractmethod
+    def put_char(self, _char: int): ...
+
     @abstractmethod
     def flush(self): ...
 

{socket.d-2.4.10.6 → socket.d-2.4.11}/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.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.6 → socket.d-2.4.11}/socketd/transport/core/IdGenerator.py

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

{socket.d-2.4.10.6 → socket.d-2.4.11}/socketd/transport/core/Listener.py

@@ -18,5 +18,5 @@ class Listener(abc.ABC):
         pass
 
     @abc.abstractmethod
-    def on_error(self, session: Session, error):
+    async def on_error(self, session: Session, error):
         pass

{socket.d-2.4.10.6 → socket.d-2.4.11}/socketd/transport/core/Processor.py

@@ -1,5 +1,6 @@
 from abc import ABC, abstractmethod
 
+from socketd.transport.core import Listener
 from socketd.transport.core.Channel import Channel
 from socketd.transport.core.ChannelInternal import ChannelInternal
 from socketd.transport.core.Frame import Frame
@@ -9,7 +10,7 @@ from socketd.transport.core.Message import Message
 class Processor(ABC):
 
     @abstractmethod
-    def set_listener(self, listener):
+    def set_listener(self, listener: Listener) -> None:
         pass
 
     @abstractmethod
@@ -31,3 +32,6 @@ class Processor(ABC):
     @abstractmethod
     def on_error(self, channel: ChannelInternal, error):
         pass
+    @abstractmethod
+    def do_close_notice(self, channel: ChannelInternal):
+        pass

{socket.d-2.4.10.6 → socket.d-2.4.11}/socketd/transport/core/codec/Buffer.py

@@ -21,16 +21,23 @@ class Buffer(BytesIO):
         rem = self.__size - self.tell()
         return rem if rem > 0 else 0
 
-    def limit(self):
-        return self.__limit
+    def position(self) -> int:
+        ...
 
     def size(self):
         return self.__size
 
+    def limit(self):
+        return self.__limit
+
     def put_int(self, num: int):
         super().write(num.to_bytes(length=4, byteorder='big', signed=False))
         self.__size += 4
 
+    def put_char(self, char:int):
+        super().write(char.to_bytes(length=2, byteorder='big', signed=False))
+        self.__size += 2
+
     def get_int(self):
         return int.from_bytes(self.read1(4), byteorder='big', signed=False)
 

{socket.d-2.4.10.6 → socket.d-2.4.11}/socketd/transport/core/codec/ByteBufferCodecReader.py

@@ -13,7 +13,7 @@ class ByteBufferCodecReader(CodecReader):
         return self.__buffer.getvalue()
 
     def get_int(self) -> int:
-        return int.from_bytes(self.__buffer.read1(4), byteorder='little', signed=False)
+        return int.from_bytes(self.__buffer.read1(4), byteorder='big', signed=False)
 
     def skip_bytes(self, size):
         self.__buffer.seek(self.__buffer.tell() + size)

{socket.d-2.4.10.6 → socket.d-2.4.11}/socketd/transport/core/codec/ByteBufferCodecWriter.py

@@ -12,7 +12,10 @@ class ByteBufferCodecWriter(CodecWriter):
         self.__buffer.write(_bytes)
 
     def put_int(self, _num: int):
-        self.__buffer.write(_num.to_bytes(length=4, byteorder='little', signed=False))
+        self.__buffer.put_int(_num)
+
+    def put_char(self, _char: int):
+        self.__buffer.put_char(_char)
 
     def flush(self):
         self.__buffer.flush()

{socket.d-2.4.10.6 → socket.d-2.4.11}/socketd/transport/core/codec/CodecDefault.py

@@ -55,15 +55,15 @@ class CodecDefault(Codec):
 
             # sid
             target.put_bytes(sidB)
-            target.put_bytes(b'\n')
+            target.put_char(10) #'\n'
 
             # event
             target.put_bytes(event)
-            target.put_bytes(b'\n')
+            target.put_char(10)
 
             # metaString
             target.put_bytes(metaStringB)
-            target.put_bytes(b'\n')
+            target.put_char(10)
 
             # _data
             if frame.message().entity().data() is not None:
@@ -73,25 +73,30 @@ class CodecDefault(Codec):
             return target
 
     def read(self, _reader: CodecReader) -> Frame | None:
-        len0 = _reader.get_int()
+        frameSize = _reader.get_int()
 
-        if len0 > (_reader.remaining() + 4):
+        if frameSize > (_reader.remaining() + 4):
             return None
 
         flag = _reader.get_int()  # 取前一位数据
 
-        if len0 == 8:
+        if frameSize == 8:
             # len + flag
             return Frame(Flags.of(flag), None)
         else:
             metaBufSize = min(Constants.MAX_SIZE_META_STRING, _reader.remaining())
+
             # 1. decode sid and event
-            by = Buffer(limit=metaBufSize)
-            sid = self.decodeString(_reader, by, Constants.MAX_SIZE_SID)
-            event = self.decodeString(_reader, by, Constants.MAX_SIZE_EVENT)
-            metaString = self.decodeString(_reader, by, Constants.MAX_SIZE_META_STRING)
+            buf = Buffer(limit=metaBufSize)
+
+            sid = self.decodeString(_reader, buf, Constants.MAX_SIZE_SID)
+
+            event = self.decodeString(_reader, buf, Constants.MAX_SIZE_EVENT)
+
+            metaString = self.decodeString(_reader, buf, Constants.MAX_SIZE_META_STRING)
+
             # 2. decode body
-            dataRealSize = len0 - _reader.position()
+            dataRealSize = frameSize - _reader.position()
             data: Optional[bytearray] = None
             if dataRealSize > Constants.MAX_SIZE_DATA:
                 # exceeded the limit, read and discard the bytes
@@ -102,15 +107,18 @@ class CodecDefault(Codec):
             else:
                 data = bytearray(_reader.get_buffer().read(dataRealSize))
 
-            message = MessageBuilder().flag(Flags.of(flag)).sid(sid).event(event).entity(
-                EntityDefault().meta_string_set(metaString).data_set(data)
-            ).build()
-            by.close()
+            message = (MessageBuilder()
+                       .flag(Flags.of(flag))
+                       .sid(sid)
+                       .event(event)
+                       .entity(EntityDefault().data_set(data).meta_string_set(metaString))
+                       .build())
+            buf.close()
             _reader.close()
             return Frame(message.flag(), message)
 
     def decodeString(self, reader: CodecReader, buf: Buffer, maxLen: int) -> str:
-        b = bytearray(reader.get_buffer().readline(maxLen).replace(b'\n', b''))
+        b = bytearray(reader.get_buffer().readline(maxLen).replace(b'\x00\n', b''))
         if buf.limit() < 1:
             return ""
         return b.decode(self.config.get_charset())

{socket.d-2.4.10.6 → socket.d-2.4.11}/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.6 → socket.d-2.4.11}/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 socketd.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
@@ -43,14 +43,18 @@ class FragmentAggregatorDefault(FragmentAggregator):
     def get(self) -> Frame:
         self.__fragmentHolders.sort(key=lambda x: x.index)
 
-        byte: BytesIO = BytesIO()
+        dataBuffer: BytesIO = BytesIO()
 
         for fragment in self.__fragmentHolders:
-            byte.write(fragment.message.data().getvalue())
+            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)
 
         return Frame(self.__main.flag(),
                      MessageBuilder()
                      .flag(self.__main.flag())
                      .sid(self.__main.sid())
-                     .entity(EntityDefault().meta_map_put(self.__main.entity().meta_map())).build()
-                     )
+                     .event(self.__main.event())
+                     .entity(entity)
+                     .build())

{socket.d-2.4.10.6 → socket.d-2.4.11}/socketd/transport/core/impl/ChannelDefault.py

@@ -19,6 +19,7 @@ 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.RunUtils import RunUtils
 
 S = TypeVar("S")
 
@@ -38,6 +39,7 @@ class ChannelDefault(ChannelBase, ChannelInternal):
         self._session: Optional[Session] = None
         self._liveTime: Optional[float] = None
         self._closeCode: int = 0
+        self._isCloseNotified = False;
 
     def is_valid(self) -> bool:
         return self.is_closed() == 0 and self._assistant.is_valid(self._source)
@@ -160,13 +162,23 @@ class ChannelDefault(ChannelBase, ChannelInternal):
         try:
             self._closeCode = code
 
-            await super().close(code)
+            await RunUtils.waitTry(super().close(code))
 
             if code > Constants.CLOSE1000_PROTOCOL_CLOSE_STARTING:
                 if self._assistant.is_valid(self._source):
                     # 如果有效且非预关闭，则尝试关闭源
-                    await self._assistant.close(self._source)
+                    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}")
+
+        if code > Constants.CLOSE1000_PROTOCOL_CLOSE_STARTING:
+            self.on_close_do()
+
+
+    def on_close_do(self):
+        if self._isCloseNotified == False:
+            self._isCloseNotified = True
+            self._processor.do_close_notice(self)
+

{socket.d-2.4.10.6 → socket.d-2.4.11}/socketd/transport/core/impl/LogConfig.py

@@ -1,13 +1,12 @@
 # 异步日志框架
-from loguru import logger as _logger
-
+import sys
 import logging
 
+from loguru import logger as _logger
+
 # socket.d 默认
 logger = logging.getLogger("socketD")
 # 异步默认日志
 logging.getLogger("asyncio").setLevel(logging.WARNING)
-# 少用默认logging ，因为他会阻塞你的线程
-# 删除原本的处理器
-_logger.remove()
+# 日志用这个
 log = _logger.opt(colors=True)

{socket.d-2.4.10.6 → socket.d-2.4.11}/socketd/transport/core/impl/ProcessorDefault.py

@@ -1,4 +1,3 @@
-import asyncio
 from abc import ABC
 from typing import Optional
 
@@ -14,6 +13,7 @@ from socketd.transport.core.Frame import Frame
 from socketd.transport.core.impl.LogConfig import log
 from socketd.transport.core.listener.SimpleListener import SimpleListener
 from socketd.transport.stream.StreamManger import StreamInternal
+from socketd.utils.RunUtils import RunUtils
 
 
 class ProcessorDefault(Processor, ABC):
@@ -143,7 +143,7 @@ class ProcessorDefault(Processor, ABC):
             self.on_message(channel, frame.message())
 
     def on_open(self, channel: ChannelInternal):
-        asyncio.create_task(self.on_open_do(channel))
+        RunUtils.taskTry(self.on_open_do(channel))
 
     async def on_open_do(self, channel: ChannelInternal):
         try:
@@ -154,7 +154,7 @@ class ProcessorDefault(Processor, ABC):
             channel.do_open_future(False, e)
 
     def on_message(self, channel: ChannelInternal, message: Message):
-        asyncio.create_task(self.on_message_do(channel, message))
+        RunUtils.taskTry(self.on_message_do(channel, message))
 
     async def on_message_do(self, channel: ChannelInternal, message: Message):
         try:
@@ -165,13 +165,19 @@ class ProcessorDefault(Processor, ABC):
 
     def on_close(self, channel: ChannelInternal):
         if channel.is_closed() <= Constants.CLOSE1000_PROTOCOL_CLOSE_STARTING:
-            asyncio.create_task(self.on_close_internal(channel, Constants.CLOSE2003_DISCONNECTION))
+            RunUtils.taskTry(self.on_close_internal(channel, Constants.CLOSE2003_DISCONNECTION))
 
     async def on_close_internal(self, channel: ChannelInternal, code: int):
         await channel.close(code)
 
-        if code > Constants.CLOSE1000_PROTOCOL_CLOSE_STARTING:
-            await self.listener.on_close(channel.get_session())
-
     def on_error(self, channel: ChannelInternal, error):
-        self.listener.on_error(channel.get_session(), error)
+        RunUtils.taskTry(self.listener.on_error(channel.get_session(), error))
+
+    def do_close_notice(self, channel: ChannelInternal):
+         RunUtils.taskTry(self.do_close_notice_internal(channel))
+
+    async def do_close_notice_internal(self, channel: ChannelInternal):
+        try:
+            await RunUtils.waitTry(self.listener.on_close(channel.get_session()))
+        except Exception as e:
+            self.on_error(channel, e)

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

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

socket.d-2.4.11/socketd/transport/core/listener/PathListener.py

@@ -0,0 +1,32 @@
+from __future__ import annotations
+
+from socketd.transport.core.Listener import Listener
+from socketd.transport.core.Session import Session
+from socketd.transport.core.listener.RouteSelector import RouteSelector
+from socketd.transport.core.listener.RouteSelectorDefault import RouteSelectorDefault
+from socketd.utils.RunUtils import RunUtils
+
+
+class PathListener(Listener):
+    def __init__(self):
+        _pathRouteSelector:RouteSelector = RouteSelectorDefault()
+
+    def doOf(self, path: str, listener: Listener) -> PathListener:
+        self._pathRouteSelector.put(path, listener)
+        return self
+
+    async def on_open(self, session: Session):
+        if l := self._pathRouteSelector.select(session.path()):
+            await RunUtils.waitTry(l.on_open(session))
+
+    async def on_message(self, session, message):
+        if l := self._pathRouteSelector.select(session.path()):
+            await RunUtils.waitTry(l.on_message(session, message))
+
+    async def on_close(self, session):
+        if l := self._pathRouteSelector.select(session.path()):
+            await RunUtils.waitTry(l.on_close(session))
+
+    async def on_error(self, session, error:Exception):
+        if l := self._pathRouteSelector.select(session.path()):
+            await RunUtils.waitTry(l.on_error(session, error))