socket.d 2.5.1__tar.gz → 2.5.2__tar.gz

{socket.d-2.5.1 → socket.d-2.5.2}/PKG-INFO

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

{socket.d-2.5.1 → socket.d-2.5.2}/setup.py

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

{socket.d-2.5.1 → socket.d-2.5.2}/socket.d.egg-info/PKG-INFO

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

{socket.d-2.5.1 → socket.d-2.5.2}/socket.d.egg-info/SOURCES.txt

@@ -8,6 +8,7 @@ socket.d.egg-info/top_level.txt
 socket.d.egg-info/zip-safe
 socketd/SocketD.py
 socketd/__init__.py
+socketd/broker/BroadcastBroker.py
 socketd/broker/BrokerFragmentHandler.py
 socketd/broker/BrokerListener.py
 socketd/broker/BrokerListenerBase.py
@@ -106,6 +107,7 @@ socketd/utils/CompletableFuture.py
 socketd/utils/LogConfig.py
 socketd/utils/MapUtils.py
 socketd/utils/RunUtils.py
+socketd/utils/SessionUtils.py
 socketd/utils/StrUtils.py
 socketd/utils/__init__.py
 socketd/utils/async_api/AtomicRefer.py

{socket.d-2.5.1 → socket.d-2.5.2}/socketd/SocketD.py

@@ -14,7 +14,7 @@ from socketd_aio_tcp.TcpAioProvider import TcpAioProvider
 
 
 def version() -> str:
-    return "2.5.1"
+    return "2.5.2"
 
 def protocol_name() -> str:
     return "Socket.D"

socket.d-2.5.2/socketd/broker/BroadcastBroker.py

@@ -0,0 +1,12 @@
+import abc
+
+from socketd.transport.core import Entity
+
+# 广播经纪人
+class BroadcastBroker:
+    # 广播
+    # @param event  事件
+    # @param entity 实体（转发方式 https://socketd.noear.org/article/737 ）
+    @abc.abstractmethod
+    def broadcast(self, event:str, entity:Entity):
+        ...

{socket.d-2.5.1 → socket.d-2.5.2}/socketd/broker/BrokerListener.py

@@ -1,11 +1,17 @@
+from socketd.broker.BroadcastBroker import BroadcastBroker
 from socketd.broker.BrokerListenerBase import BrokerListenerBase
+from socketd.exception.SocketDExecption import SocketDException
 from socketd.transport.core import Entity
+from socketd.transport.core.Flags import Flags
 from socketd.transport.core.Message import Message
 from socketd.transport.core.Session import Session
+from socketd.transport.core.entity.MessageBuilder import MessageBuilder
+from socketd.utils.LogConfig import log
+from socketd.utils.SessionUtils import SessionUtils
 
 
 # 经纪人监听器（为不同的玩家转发消息）
-class BrokerListener(BrokerListenerBase):
+class BrokerListener(BrokerListenerBase, BroadcastBroker):
     def __init__(self):
         super().__init__()
 
@@ -21,7 +27,10 @@ class BrokerListener(BrokerListenerBase):
         atName = message.at_name()
 
         if atName is None:
-            await requester.send_alarm(message, "Broker message require '@' meta")
+            if requester:
+                await requester.send_alarm(message, "Broker message require '@' meta")
+            else:
+                raise SocketDException("Broker message require '@' meta")
             return
 
         if atName.__eq__("*"):
@@ -34,13 +43,26 @@ class BrokerListener(BrokerListenerBase):
             # 群发模式（给同名的所有玩家）
             atName = atName[:-1]
             if not self.forward_to_name(requester, message, atName):
-                await requester.send_alarm(message, "Broker don't have '@" + atName + "' player")
+                if requester:
+                    await requester.send_alarm(message, "Broker don't have '@" + atName + "' player")
+                else:
+                    raise SocketDException("Broker don't have '@" + atName + "' player")
         else:
             responder = self.get_player_any(atName, requester, message)
             if responder is not None:
                 self.forward_to_session(requester, message, responder)
             else:
-                await requester.send_alarm(message, "Broker don't have '@" + atName + "' session")
+                if requester:
+                    await requester.send_alarm(message, "Broker don't have '@" + atName + "' session")
+                else:
+                    raise SocketDException("Broker don't have '@" + atName + "' session")
+
+    # 广播
+    def broadcast(self, event:str, entity:Entity):
+        self.onMessage(None, MessageBuilder()
+                .flag(Flags.Message)
+                .event(event)
+                .entity(entity).build())
 
     # 批量转发消息
     def forward_to_name(self, requester: Session, message: Message, name: str) -> bool:
@@ -61,11 +83,11 @@ class BrokerListener(BrokerListenerBase):
     def forward_to_session(self, requester: Session, message: Message, responder: Session):
         if message.is_request():
             def then_reply(reply: Entity):
-                if requester.is_valid():
+                if SessionUtils.is_valid(requester):
                     requester.reply(message, reply)
 
             def then_error(err: Exception):
-                if requester.is_valid():
+                if SessionUtils.is_valid(requester):
                     requester.send_alarm(message, err)
 
             responder.send_and_request(message.event(), message, -1).then_reply(then_reply).then_error(then_error)
@@ -73,14 +95,14 @@ class BrokerListener(BrokerListenerBase):
 
         if message.is_subscribe():
             def then_reply(reply: Entity):
-                if requester.is_valid():
+                if SessionUtils.is_valid(requester):
                     if message.is_end():
                         requester.reply_end(message, reply)
                     else:
                         requester.reply(message, reply)
 
             def then_error(err: Exception):
-                if requester.is_valid():
+                if SessionUtils.is_valid(requester):
                     requester.send_alarm(message, err)
 
             responder.send_and_subscribe(message.event(), message, -1).then_reply(then_reply).then_error(then_error)
@@ -89,5 +111,4 @@ class BrokerListener(BrokerListenerBase):
         responder.send(message.event(), message)
 
     def on_error(self, session: Session, error):
-        ...
-        # log.warning("Broker error", error)
+        log.warning("Broker error", error)

{socket.d-2.5.1 → socket.d-2.5.2}/socketd/cluster/ClusterClientSession.py

@@ -36,6 +36,12 @@ class ClusterClientSession(ClientSession):
                 return True
         return False
 
+    def is_active(self) -> bool:
+        for session in self.__sessionSet:
+            if session.is_active():
+                return True
+        return False
+
     def is_closing(self) -> bool:
         for session in self.__sessionSet:
             if session.is_closing():

{socket.d-2.5.1 → socket.d-2.5.2}/socketd/cluster/LoadBalancer.py

@@ -2,6 +2,7 @@ from threading import RLock
 from typing import List
 
 from socketd.transport.client.ClientSession import ClientSession
+from socketd.utils.SessionUtils import SessionUtils
 from socketd.utils.StrUtils import StrUtils
 
 
@@ -39,7 +40,7 @@ class LoadBalancer:
         else:
             sessions: List[ClientSession] = []
             for s in coll:
-                if s.is_valid() and not s.is_closing():
+                if SessionUtils.is_active(s):
                     sessions.append(s)
 
             if sessions.__len__() == 0:
@@ -59,7 +60,7 @@ class LoadBalancer:
             return None
         else:
             for s in coll:
-                if s.is_valid() and not s.is_closing():
+                if SessionUtils.is_active(s):
                     return s
 
             return None

{socket.d-2.5.1 → socket.d-2.5.2}/socketd/transport/client/ClientSession.py

@@ -12,6 +12,10 @@ class ClientSession:
     def is_valid(self) -> bool:
         ...
 
+    @abc.abstractmethod
+    def is_active(self) -> bool:
+        ...
+
     @abc.abstractmethod
     def is_closing(self)->bool:
         ...

{socket.d-2.5.1 → socket.d-2.5.2}/socketd/transport/core/impl/SessionBase.py

@@ -48,6 +48,9 @@ class SessionBase(Session, ABC):
     def session_id(self) -> str:
         return self._session_id
 
+    def is_active(self) -> bool:
+        return self.is_valid() and self.is_closing() == False
+
     def live_time(self)->int:
         return self._channel.get_live_time()
 

socket.d-2.5.2/socketd/utils/SessionUtils.py

@@ -0,0 +1,11 @@
+from socketd.transport.client.ClientSession import ClientSession
+
+# 会话工具（主要检测状态）
+class SessionUtils:
+    @staticmethod
+    def is_active(s: ClientSession) -> bool:
+        return s and  s.is_active()
+
+    @staticmethod
+    def is_valid(s: ClientSession) -> bool:
+        return s and s.is_valid()