dimples 0.4.1__tar.gz → 0.4.3__tar.gz

{dimples-0.4.1 → dimples-0.4.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dimples
-Version: 0.4.1
+Version: 0.4.3
 Summary: DIMP Library for Edges and Stations
 Home-page: https://github.com/dimchat/demo-py
 Author: Albert Moky

{dimples-0.4.1 → dimples-0.4.3}/dimples/client/terminal.py

@@ -81,6 +81,11 @@ class Terminal(Runner, StateDelegate, Logging):
         now = time.time()
         return now < (self.__last_time + 600)
 
+    # @property  # Override
+    # def running(self) -> bool:
+    #     if super().running:
+    #         return self.is_alive
+
     def start(self):
         thread = threading.Thread(target=self.run, daemon=True)
         thread.start()

{dimples-0.4.1 → dimples-0.4.3}/dimples/conn/gate.py

@@ -72,12 +72,14 @@ class BaseGate(StarGate, Generic[H], ABC):
         return super()._get_docker(remote=remote, local=None)
 
     # Override
-    def _set_docker(self, remote: SocketAddress, local: Optional[SocketAddress], docker: Docker):
-        super()._set_docker(remote=remote, local=None, docker=docker)
+    def _set_docker(self, docker: Docker,
+                    remote: SocketAddress, local: Optional[SocketAddress]):
+        super()._set_docker(docker=docker, remote=remote, local=None)
 
     # Override
-    def _remove_docker(self, remote: SocketAddress, local: Optional[SocketAddress], docker: Optional[Docker]):
-        super()._remove_docker(remote=remote, local=None, docker=docker)
+    def _remove_docker(self, docker: Optional[Docker],
+                       remote: SocketAddress, local: Optional[SocketAddress]) -> Optional[Docker]:
+        return super()._remove_docker(docker=docker, remote=remote, local=None)
 
     # Override
     def _heartbeat(self, connection: Connection):
@@ -194,7 +196,7 @@ class CommonGate(BaseGate, Logging, Generic[H], ABC):
                 if docker is None:
                     assert False, 'failed to create docker: %s, %s' % (remote, local)
                 else:
-                    self._set_docker(remote=remote, local=local, docker=docker)
+                    self._set_docker(docker=docker, remote=docker.remote_address, local=docker.local_address)
         return docker
 
 

{dimples-0.4.1 → dimples-0.4.3}/dimples/conn/gatekeeper.py

@@ -35,7 +35,8 @@ from typing import Optional, Tuple
 
 from dimsdk import ReliableMessage
 
-from startrek import Hub
+from startrek.types import SocketAddress
+from startrek import Channel, Hub
 from startrek import BaseChannel
 from startrek import Connection, ConnectionDelegate, BaseConnection
 from startrek import Arrival, Departure
@@ -57,39 +58,69 @@ from .queue import MessageQueue, MessageWrapper
 class StreamServerHub(ServerHub):
 
     def put_channel(self, channel: StreamChannel):
-        self._set_channel(remote=channel.remote_address, local=channel.local_address, channel=channel)
+        self._set_channel(channel=channel, remote=channel.remote_address, local=None)
 
     # Override
-    def _get_connection(self, remote: Tuple[str, int], local: Optional[Tuple[str, int]]) -> Optional[Connection]:
+    def _get_channel(self, remote: Optional[SocketAddress], local: Optional[SocketAddress]) -> Optional[Channel]:
+        return super()._get_channel(remote=remote, local=None)
+
+    # Override
+    def _set_channel(self, channel: Channel,
+                     remote: Optional[SocketAddress], local: Optional[SocketAddress]):
+        super()._set_channel(channel=channel, remote=remote, local=None)
+
+    # Override
+    def _remove_channel(self, channel: Optional[Channel],
+                        remote: Optional[SocketAddress], local: Optional[SocketAddress]) -> Optional[Channel]:
+        return super()._remove_channel(channel=channel, remote=remote, local=None)
+
+    # Override
+    def _get_connection(self, remote: SocketAddress, local: Optional[SocketAddress]) -> Optional[Connection]:
         return super()._get_connection(remote=remote, local=None)
 
     # Override
-    def _set_connection(self, remote: Tuple[str, int], local: Optional[Tuple[str, int]], connection: Connection):
-        super()._set_connection(remote=remote, local=None, connection=connection)
+    def _set_connection(self, connection: Connection,
+                        remote: SocketAddress, local: Optional[SocketAddress]):
+        super()._set_connection(connection=connection, remote=remote, local=None)
 
     # Override
-    def _remove_connection(self, remote: Tuple[str, int], local: Optional[Tuple[str, int]],
-                           connection: Optional[Connection]):
-        super()._remove_connection(remote=remote, local=None, connection=connection)
+    def _remove_connection(self, connection: Optional[Connection],
+                           remote: SocketAddress, local: Optional[SocketAddress]) -> Optional[Connection]:
+        return super()._remove_connection(connection=connection, remote=remote, local=None)
 
 
 class StreamClientHub(ClientHub):
 
     def put_channel(self, channel: StreamChannel):
-        self._set_channel(remote=channel.remote_address, local=channel.local_address, channel=channel)
+        self._set_channel(channel=channel, remote=channel.remote_address, local=None)
+
+    # Override
+    def _get_channel(self, remote: Optional[SocketAddress], local: Optional[SocketAddress]) -> Optional[Channel]:
+        return super()._get_channel(remote=remote, local=None)
+
+    # Override
+    def _set_channel(self, channel: Channel,
+                     remote: Optional[SocketAddress], local: Optional[SocketAddress]):
+        super()._set_channel(channel=channel, remote=remote, local=None)
+
+    # Override
+    def _remove_channel(self, channel: Optional[Channel],
+                        remote: Optional[SocketAddress], local: Optional[SocketAddress]) -> Optional[Channel]:
+        return super()._remove_channel(channel=channel, remote=remote, local=None)
 
     # Override
-    def _get_connection(self, remote: Tuple[str, int], local: Optional[Tuple[str, int]]) -> Optional[Connection]:
+    def _get_connection(self, remote: SocketAddress, local: Optional[SocketAddress]) -> Optional[Connection]:
         return super()._get_connection(remote=remote, local=None)
 
     # Override
-    def _set_connection(self, remote: Tuple[str, int], local: Optional[Tuple[str, int]], connection: Connection):
-        super()._set_connection(remote=remote, local=None, connection=connection)
+    def _set_connection(self, connection: Connection,
+                        remote: SocketAddress, local: Optional[SocketAddress]):
+        super()._set_connection(connection=connection, remote=remote, local=None)
 
     # Override
-    def _remove_connection(self, remote: Tuple[str, int], local: Optional[Tuple[str, int]],
-                           connection: Optional[Connection]):
-        super()._remove_connection(remote=remote, local=None, connection=connection)
+    def _remove_connection(self, connection: Optional[Connection],
+                           remote: SocketAddress, local: Optional[SocketAddress]) -> Optional[Connection]:
+        return super()._remove_connection(connection=connection, remote=remote, local=None)
 
 
 def reset_send_buffer_size(conn: Connection) -> bool:

{dimples-0.4.1 → dimples-0.4.3}/dimples/edge/octopus.py

@@ -112,9 +112,21 @@ class Octopus(Runner, Logging):
             self.__outer_map[identifier] = terminal
 
     def connect(self, host: str, port: int = 9394):
-        terminal = self.create_outer_terminal(host=host, port=port)
+        # create a new terminal for remote host:port
         with self.__outer_lock:
+            # check exist terminals
+            outers = set(self.__outers)
+            for out in outers:
+                # check station
+                station = out.session.station
+                if port == station.port and host == station.host:
+                    self.warning(msg='connection already exists: (%s, %d)' % (host, port))
+                    # self.__outers.discard(out)
+                    return None
+            # create new terminal
+            terminal = self.create_outer_terminal(host=host, port=port)
             self.__outers.add(terminal)
+            return terminal
 
     def start(self):
         thread = threading.Thread(target=self.run)
@@ -139,24 +151,33 @@ class Octopus(Runner, Logging):
         assert len(providers) > 0, 'service provider not found'
         gsp = providers[0].identifier
         neighbors = db.all_stations(provider=gsp)
+        if neighbors is not None:
+            neighbors = neighbors.copy()
         # get all outer terminals
         with self.__outer_lock:
             outers = set(self.__outers)
+        self.debug(msg='checking %d client(s) with %d neighbor(s)' % (len(outers), len(neighbors)))
         for out in outers:
             # check station
             station = out.session.station
+            sid = station.identifier
             host = station.host
             port = station.port
+            # reduce neighbors
             for item in neighbors:
                 if item.port == port and item.host == host:
                     # got
                     neighbors.remove(item)
                     break
+            # check outer client
             if out.is_alive:
-                # outer terminal alive, ignore it
+                # skip running client
                 continue
+            else:
+                self.warning(msg='stop timeout client: %s (%s:%d)' % (sid, host, port))
+                out.stop()
             # remove dead terminal
-            sid = station.identifier
+            self.debug(msg='removing inactive client: %s (%s:%d)' % (sid, host, port))
             with self.__outer_lock:
                 self.__outers.discard(out)
                 if sid is not None:
@@ -165,7 +186,7 @@ class Octopus(Runner, Logging):
         for item in neighbors:
             host = item.host
             port = item.port
-            self.info(msg='connecting neighbor station (%s:%d)' % (host, port))
+            self.debug(msg='connecting neighbor station (%s:%d), client count: %d' % (host, port, len(self.__outers)))
             self.connect(host=host, port=port)
         return False
 

{dimples-0.4.1 → dimples-0.4.3}/dimples/server/archivist.py

@@ -138,6 +138,8 @@ class ServerArchivist(CommonArchivist, ABC):
         # dispatch
         dispatcher = Dispatcher()
         neighbors = self.all_neighbors
+        # avoid the new recipients redirect it to same targets
+        r_msg['recipients'] = ID.revert(neighbors)
         for receiver in neighbors:
             if receiver == sid:
                 self.debug(msg='skip cycled message: %s -> %s' % (sid, receiver))

{dimples-0.4.1 → dimples-0.4.3}/dimples/server/messenger.py

@@ -58,6 +58,7 @@ class ServerMessenger(CommonMessenger):
         assert isinstance(packer, CommonMessagePacker), 'message packer error: %s' % packer
         messages = packer.resume_reliable_messages()
         for msg in messages:
+            msg.pop('error', None)
             self.info(msg='processing suspended message: %s -> %s' % (msg.sender, msg.receiver))
             try:
                 responses = self.process_reliable_message(msg=msg)

{dimples-0.4.1 → dimples-0.4.3}/dimples/server/processor.py

@@ -132,14 +132,14 @@ class ServerMessageProcessor(MessageProcessor, Logging):
             #   we can trust it too;
             if receiver == Station.EVERY or receiver == EVERYONE:
                 # broadcast message (to neighbor stations)
-                # e.g.: 'stations@everywhere'
+                # e.g.: 'stations@everywhere', 'everyone@everywhere'
                 self._broadcast_message(msg=msg, station=station)
                 # if receiver == 'everyone@everywhere':
                 #     broadcast message to all destinations,
                 #     current station is it's receiver too.
             elif receiver.is_broadcast:
                 # broadcast message (to station bots)
-                # e.g.: 'archivist@anywhere', 'announcer@anywhere', 'monitor@anywhere'
+                # e.g.: 'archivist@anywhere', 'announcer@anywhere', 'monitor@anywhere', ...
                 self._broadcast_message(msg=msg, station=station)
                 return []
             elif receiver.is_group:
@@ -186,24 +186,63 @@ class ServerMessageProcessor(MessageProcessor, Logging):
             return [r_msg]
 
     def _broadcast_message(self, msg: ReliableMessage, station: ID):
-        """ broadcast message to neighbor stations """
-        archivist = self.facebook.archivist
-        assert isinstance(archivist, ServerArchivist)
-        neighbors = archivist.all_neighbors
+        """ broadcast message to actual recipients """
         sender = msg.sender
-        self.info(msg='broadcast message %s -> %s (%s): from station %s to %s'
-                      % (sender, msg.receiver, msg.group, station, neighbors))
+        receiver = msg.receiver
+        assert receiver.is_broadcast, 'broadcast message error: %s -> %s' % (sender, receiver)
+        self.info(msg='broadcast message %s -> %s (%s)' % (sender, receiver, msg.group))
+        if receiver.is_user:
+            # broadcast message to station bots
+            # e.g.: 'archivist@anywhere', 'announcer@anywhere', 'monitor@anywhere', ...
+            name = receiver.name
+            assert name is not None and name != 'station' and name != 'anyone', 'receiver error: %s' % receiver
+            bot = AnsCommandProcessor.ans_id(name=name)
+            if bot is None:
+                self.warning(msg='failed to get receiver: %s' % receiver)
+                return False
+            candidates = set()
+            candidates.add(bot)
+            self.info(msg='forward to station bot: %s -> %s' % (name, bot))
+        elif receiver == Station.EVERY or receiver == EVERYONE:
+            # broadcast message to neighbor stations
+            # e.g.: 'stations@everywhere', 'everyone@everywhere'
+            archivist = self.facebook.archivist
+            assert isinstance(archivist, ServerArchivist)
+            candidates = archivist.all_neighbors
+            if len(candidates) == 0:
+                self.warning(msg='failed to get neighbors: %s' % receiver)
+                return False
+            self.info(msg='forward to neighbor stations: %s -> %s' % (receiver, candidates))
+        else:
+            self.warning(msg='unknown receiver: %s' % receiver)
+            return False
+        # check recipients
+        new_recipients = candidates.copy()
+        old_recipients = msg.get('recipients')
+        if old_recipients is None:
+            all_recipients = []
+        else:
+            all_recipients = ID.convert(old_recipients)
+            # check duplicated
+            self.info(msg='discard recipients: %s, new recipients: %s' % (old_recipients, new_recipients))
+            for item in all_recipients:
+                new_recipients.discard(item)
+            if len(new_recipients) == 0:
+                self.info(msg='new recipients empty: %s => %s' % (receiver, candidates))
+                return False
+        self.info(msg='append new recipients: %s, %s => %s' % (receiver, new_recipients, all_recipients))
+        for item in new_recipients:
+            all_recipients.append(item)
+        # avoid the new recipients redirect it to same targets
+        msg['recipients'] = ID.revert(all_recipients)
         # dispatch
         dispatcher = Dispatcher()
-        for receiver in neighbors:
-            if receiver == sender:
-                self.debug(msg='skip cycled message: %s -> %s' % (sender, receiver))
-                continue
-            elif receiver == station:
-                self.debug(msg='skip current station: %s -> %s' % (sender, receiver))
-                continue
-            dispatcher.deliver_message(msg=msg, receiver=receiver)
-        return len(neighbors) > 0
+        for target in new_recipients:
+            if target == sender or target == station:
+                self.info(msg='skip cycled message: %s -> %s, %s' % (sender, receiver, target))
+            else:
+                dispatcher.deliver_message(msg=msg, receiver=target)
+        return True
 
     def _split_group_message(self, msg: ReliableMessage, station: ID):
         """ redirect group message to assistant """

{dimples-0.4.1 → dimples-0.4.3}/dimples.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dimples
-Version: 0.4.1
+Version: 0.4.3
 Summary: DIMP Library for Edges and Stations
 Home-page: https://github.com/dimchat/demo-py
 Author: Albert Moky

{dimples-0.4.1 → dimples-0.4.3}/dimples.egg-info/requires.txt

@@ -3,6 +3,6 @@ dimsdk>=1.0.3
 dimp>=1.0.3
 dkd>=1.0.2
 mkm>=1.0.2
-startrek>=1.0.0
-tcp>=1.0.0
-udp>=1.0.0
+startrek>=1.0.3
+tcp>=1.0.3
+udp>=1.0.3

{dimples-0.4.1 → dimples-0.4.3}/setup.py

@@ -14,7 +14,7 @@ import io
 
 from setuptools import setup, find_packages
 
-__version__ = '0.4.1'
+__version__ = '0.4.3'
 __author__ = 'Albert Moky'
 __contact__ = 'albert.moky@gmail.com'
 
@@ -58,8 +58,8 @@ setup(
         'dkd>=1.0.2',
         'mkm>=1.0.2',
 
-        'startrek>=1.0.0',
-        'tcp>=1.0.0',
-        'udp>=1.0.0',
+        'startrek>=1.0.3',
+        'tcp>=1.0.3',
+        'udp>=1.0.3',
     ]
 )