dimples 0.5.6__tar.gz → 0.5.8__tar.gz

{dimples-0.5.6 → dimples-0.5.8}/PKG-INFO

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

{dimples-0.5.6 → dimples-0.5.8}/dimples/edge/octopus.py

@@ -190,35 +190,63 @@ class Octopus(Runner, Logging):
 
     def income_message(self, msg: ReliableMessage, priority: int = 0) -> List[ReliableMessage]:
         """ redirect message from remote station """
+        sender = msg.sender
+        receiver = msg.receiver
         sig = get_msg_sig(msg=msg)
         messenger = self.inner_messenger
         if messenger.send_reliable_message(msg=msg, priority=priority):
-            self.info(msg='redirected msg (%s) for receiver (%s)' % (sig, msg.receiver))
+            self.info(msg='redirected msg (%s): %s -> %s' % (sig, sender, receiver))
         else:
-            self.error(msg='failed to redirect msg (%s) for receiver (%s)' % (sig, msg.receiver))
+            self.error(msg='failed to redirect msg (%s): %s -> %s' % (sig, sender, receiver))
         # no need to respond receipt for station
         return []
 
     def outgo_message(self, msg: ReliableMessage, priority: int = 0) -> List[ReliableMessage]:
         """ redirect message to remote station """
-        target = ID.parse(identifier=msg.get('neighbor'))
-        if target is None:
-            # target station not found
-            self.info(msg='cannot get target station for receiver (%s)' % msg.receiver)
-            return []
-        messenger = self.get_outer_messenger(identifier=target)
-        if messenger is None:
-            # target station not my neighbor
-            self.info(msg='receiver (%s) is targeted to (%s), but not my neighbor' % (msg.receiver, target))
-            return []
-        msg.pop('neighbor', None)
-        if messenger.send_reliable_message(msg=msg, priority=priority):
-            sig = get_msg_sig(msg=msg)
-            self.info(msg='redirected msg (%s) to target (%s) for receiver (%s)' % (sig, target, msg.receiver))
-            # no need to respond receipt for station
-            return []
+        receiver = msg.receiver
+        # get neighbor stations
+        neighbor = ID.parse(identifier=msg.get('neighbor'))
+        if neighbor is not None:
+            neighbors = set()
+            neighbors.add(neighbor)
+            msg.pop('neighbor', None)
+        else:
+            with self.__outer_lock:
+                neighbors = set(self.__outer_map.keys())
+        #
+        #  0. check recipients
+        #
+        new_recipients = set()
+        old_recipients = msg.get('recipients')
+        old_recipients = [] if old_recipients is None else ID.convert(old_recipients)
+        for item in neighbors:
+            if item in old_recipients:
+                self.info(msg='skip exists station: %s' % item)
+                continue
+            self.info(msg='new neighbor station: %s' % item)
+            new_recipients.add(item)
+        # update 'recipients' to avoid the new recipients redirect it to same targets
+        self.info(msg='append new recipients: %s, %s + %s' % (receiver, new_recipients, old_recipients))
+        all_recipients = list(old_recipients) + list(new_recipients)
+        msg['recipients'] = ID.revert(all_recipients)
+        #
+        #  1. send to the new recipients (neighbor stations)
+        #
         sig = get_msg_sig(msg=msg)
-        self.error(msg='failed to redirect msg (%s) to target (%s) for receiver (%s)' % (sig, target, msg.receiver))
+        failed_neighbors = []
+        for target in new_recipients:
+            messenger = self.get_outer_messenger(identifier=target)
+            if messenger is None:
+                # target station not my neighbor
+                self.warning(msg='not my neighbor: %s (%s)' % (target, receiver))
+                failed_neighbors.append(target)
+            elif messenger.send_reliable_message(msg=msg, priority=priority):
+                self.info(msg='redirected msg (%s) to neighbor: %s (%s)' % (sig, target, receiver))
+            else:
+                self.error(msg='failed to send to neighbor: %s (%s)' % (target, receiver))
+                failed_neighbors.append(target)
+        if len(failed_neighbors) > 0:
+            self.error(msg='failed to redirect msg (%s) for receiver (%s): %s' % (sig, receiver, failed_neighbors))
         return []
 
 

{dimples-0.5.6 → dimples-0.5.8}/dimples/server/dispatcher.py

@@ -206,26 +206,27 @@ class Dispatcher(MessageDeliver, Logging):
             return [res]
 
     def __broadcast_message(self, msg: ReliableMessage, receiver: ID, neighbors: Set[ID]) -> List[Content]:
+        current = self.facebook.current_user
+        assert current is not None, 'failed to get current station'
+        current = current.identifier
         #
         #  0. check recipients
         #
-        new_recipients = neighbors.copy()
+        new_recipients = set()
         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, neighbors))
-                return []
-        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
+        old_recipients = [] if old_recipients is None else ID.convert(old_recipients)
+        for item in neighbors:
+            if item == current:
+                self.info(msg='skip current station: %s' % item)
+                continue
+            elif item in old_recipients:
+                self.info(msg='skip exists station: %s' % item)
+                continue
+            self.info(msg='new neighbor station: %s' % item)
+            new_recipients.add(item)
+        # set 'recipients' in the msg to avoid the new recipients redirect it to same targets
+        self.info(msg='append new recipients: %s, %s + %s' % (receiver, new_recipients, old_recipients))
+        all_recipients = list(old_recipients) + list(new_recipients)
         msg['recipients'] = ID.revert(all_recipients)
         #
         #  1. push to neighbor stations directly
@@ -234,10 +235,13 @@ class Dispatcher(MessageDeliver, Logging):
         for target in new_recipients:
             if session_push(msg=msg, receiver=target) == 0:
                 indirect_neighbors.add(target)
-        if len(indirect_neighbors) > 0:
-            for item in indirect_neighbors:
-                all_recipients.remove(item)
-            msg['recipients'] = ID.revert(all_recipients)
+        # remove unsuccessful items
+        for item in indirect_neighbors:
+            new_recipients.discard(item)
+        # update 'recipients' before redirect via bridge
+        self.info(msg='update recipients: %s, %s + %s' % (receiver, new_recipients, old_recipients))
+        all_recipients = list(old_recipients) + list(new_recipients)
+        msg['recipients'] = ID.revert(all_recipients)
         #
         #  2. push to other neighbor stations via station bridge
         #
@@ -384,7 +388,7 @@ class DeliverWorker(Logging):
         :return: responses
         """
         """ Redirect message to neighbor station """
-        assert neighbor.type == EntityType.STATION, 'neighbor station ID error: %s' % neighbor
+        assert neighbor is None or neighbor.type == EntityType.STATION, 'neighbor station ID error: %s' % neighbor
         self.info(msg='redirect message %s => %s to neighbor station: %s' % (msg.sender, msg.receiver, neighbor))
         # 0. check current station
         current = self.facebook.current_user.identifier

{dimples-0.5.6 → dimples-0.5.8}/dimples.egg-info/PKG-INFO

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

{dimples-0.5.6 → dimples-0.5.8}/setup.py

@@ -14,7 +14,7 @@ import io
 
 from setuptools import setup, find_packages
 
-__version__ = '0.5.6'
+__version__ = '0.5.8'
 __author__ = 'Albert Moky'
 __contact__ = 'albert.moky@gmail.com'