socket.d 2.4.14.4__tar.gz → 2.4.15__tar.gz

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

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

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

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

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

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

{socket.d-2.4.14.4 → socket.d-2.4.15}/socketd/SocketD.py

@@ -14,20 +14,23 @@ from socketd_aio_tcp.TcpAioProvider import TcpAioProvider
 
 
 def version() -> str:
-    return "2.4.14"
+    return "2.4.15"
 
 
 def protocol_version() -> str:
     return "1.0"
 
 
-client_factory_map: Dict[str, ClientProvider] = {}
-server_factory_map: Dict[str, ServerProvider] = {}
+__client_provider_map: Dict[str, ClientProvider] = {}
+__server_provider_map: Dict[str, ServerProvider] = {}
 
-def load_factories(factories: list[ClientProvider | ServerProvider], factory_map: Dict[str, object]) -> None:
-    for factory in factories:
-        for schema in factory.schema():
-            factory_map[schema] = factory
+def register_client_provider(clientProvider: ClientProvider):
+    for s in clientProvider.schema():
+        __client_provider_map[s] = clientProvider
+
+def register_server_provider(serverProvider: ServerProvider):
+    for s in serverProvider.schema():
+        __server_provider_map[s] = serverProvider
 
 def create_server(schemaOrConfig: str | ServerConfig) -> Server:
     Asserts.assert_null("schemaOrConfig", schemaOrConfig)
@@ -46,12 +49,12 @@ def create_server(schemaOrConfig: str | ServerConfig) -> Server:
         return server
 
 def create_server_or_null(config: ServerConfig) -> Server:
-    factory = server_factory_map.get(config.get_schema())
+    provider = __server_provider_map.get(config.get_schema())
 
-    if factory is None:
+    if provider is None:
         return None
     else:
-        return factory.create_server(config)
+        return provider.create_server(config)
 
 
 def create_client(urlOrConfig: str | ClientConfig) -> Client:
@@ -73,17 +76,18 @@ def create_client(urlOrConfig: str | ClientConfig) -> Client:
 def create_client_or_null(config: ClientConfig) -> Client | None:
     Asserts.assert_null("config", config)
 
-    factory = client_factory_map.get(config.get_schema())
-    if factory is None:
+    provider = __client_provider_map.get(config.get_schema())
+    if provider is None:
         return None
     else:
-        return factory.create_client(config)
+        return provider.create_client(config)
 
 
 def create_cluster_client(*urls) -> Client:
     return ClusterClient(urls)
 
 
-# Initialize the client and server factory maps
-load_factories([WsAioProvider(), TcpAioProvider()], server_factory_map)
-load_factories([WsAioProvider(), TcpAioProvider()], client_factory_map)
+# Initialize the client and server provider maps
+for p in [WsAioProvider(), TcpAioProvider()]:
+    register_client_provider(p)
+    register_server_provider(p)

{socket.d-2.4.14.4 → socket.d-2.4.15}/socketd/cluster/ClusterClientSession.py

@@ -50,12 +50,12 @@ class ClusterClientSession(ClientSession):
 
         return sender.send(event, content)
 
-    def send_and_request(self, event: str, content: Entity, timeout: int) -> RequestStream:
+    def send_and_request(self, event: str, content: Entity, timeout: float = 0) -> RequestStream:
         sender = self.get_session_any(None)
 
         return sender.send_and_request(event, content, timeout)
 
-    def send_and_subscribe(self, event: str, content: Entity, timeout: int = 0) -> SubscribeStream:
+    def send_and_subscribe(self, event: str, content: Entity, timeout: float = 0) -> SubscribeStream:
         sender = self.get_session_any(None)
 
         return sender.send_and_subscribe(event, content, timeout)

{socket.d-2.4.14.4 → socket.d-2.4.15}/socketd/transport/client/ClientSession.py

@@ -25,11 +25,11 @@ class ClientSession:
         ...
 
     @abc.abstractmethod
-    def send_and_request(self, event: str, content: Entity, timeout: int = 0) -> RequestStream:
+    def send_and_request(self, event: str, content: Entity, timeout: float = 0) -> RequestStream:
         ...
 
     @abc.abstractmethod
-    def send_and_subscribe(self, event: str, content: Entity, timeout: int = 0) -> SubscribeStream:
+    def send_and_subscribe(self, event: str, content: Entity, timeout: float = 0) -> SubscribeStream:
         ...
 
     @abc.abstractmethod

{socket.d-2.4.14.4 → socket.d-2.4.15}/socketd/transport/core/impl/SessionDefault.py

@@ -53,20 +53,28 @@ class SessionDefault(SessionBase):
         RunUtils.taskTry(self._channel.send(Frame(Flags.Message, message), stream))
         return stream
 
-    def send_and_request(self, event: str, content: Entity,
-                               timeout: int|None = 100) -> RequestStream:
-
+    def send_and_request(self, event: str, content: Entity, timeout: float|None = 0) -> RequestStream:
         if timeout is None:
-            timeout = 100
+            timeout = 0
+
+        if timeout < 0:
+            timeout = self._channel.get_config().get_stream_timeout()
+
+        if timeout == 0:
+            timeout = self._channel.get_config().get_request_timeout()
 
-        if timeout < 100:
-            timeout = self._channel.get_config().get_request_timeout() / 1000
         message = MessageBuilder().sid(self.generate_id()).event(event).entity(content).build()
         stream:RequestStream = RequestStreamImpl(message.sid(), timeout)
         RunUtils.taskTry(self._channel.send(Frame(Flags.Request, message), stream))
         return stream
 
-    def send_and_subscribe(self, event: str, content: Entity, timeout: int = 0):
+    def send_and_subscribe(self, event: str, content: Entity, timeout: float = 0):
+        if timeout is None:
+            timeout = 0
+
+        if timeout <= 0:
+            timeout = self._channel.get_config().get_stream_timeout()
+
         message = MessageBuilder().sid(self.generate_id()).event(event).entity(content).build()
         stream:SubscribeStream = SubscribeStreamImpl(message.sid(), timeout)
         RunUtils.taskTry(self._channel.send(Frame(Flags.Subscribe, message), stream))

{socket.d-2.4.14.4 → socket.d-2.4.15}/socketd/transport/stream/impl/StreamBase.py

@@ -11,12 +11,13 @@ from socketd.utils.RunUtils import RunUtils
 
 
 class StreamBase(StreamInternal, ABC):
-    """流接收器基类"""
-
-    def __init__(self, sid: str, demands: int, timeout: int):
-        self.__sid = sid
-        self.__timeout = timeout
-        self.__demands = demands
+    """流接收器基类
+    :param timeout: 超时（毫秒）
+    """
+    def __init__(self, sid: str, demands: int, timeout: float):
+        self.__sid:str = sid
+        self.__timeout:float = timeout
+        self.__demands:int = demands
 
         self.__doOnError: Callable[[Exception], None] = None
         self.__doOnProgress: Callable[[bool, int, int], None] = None
@@ -38,7 +39,7 @@ class StreamBase(StreamInternal, ABC):
     def demands(self) -> int:
         return self.__demands
 
-    def timeout(self):
+    def timeout(self) ->float:
         return self.__timeout
 
     # 保险开始（避免永久没有回调，造成内存不能释放）