dimples 0.5.7__tar.gz → 0.5.8__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dimples
-Version: 0.5.7
+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.7 → dimples-0.5.8}/dimples/edge/octopus.py

@@ -220,15 +220,14 @@ class Octopus(Runner, Logging):
         old_recipients = msg.get('recipients')
         old_recipients = [] if old_recipients is None else ID.convert(old_recipients)
         for item in neighbors:
-            if item not in old_recipients:
-                new_recipients.add(item)
-        all_recipients = []
-        for item in old_recipients:
-            all_recipients.append(item)
-        # avoid the new recipients redirect it to same targets
-        self.info(msg='append new recipients: %s, %s => %s' % (receiver, new_recipients, all_recipients))
-        for item in new_recipients:
-            all_recipients.append(item)
+            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)

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

@@ -206,6 +206,9 @@ 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
         #
@@ -213,15 +216,17 @@ class Dispatcher(MessageDeliver, Logging):
         old_recipients = msg.get('recipients')
         old_recipients = [] if old_recipients is None else ID.convert(old_recipients)
         for item in neighbors:
-            if item not in old_recipients:
-                new_recipients.add(item)
-        all_recipients = []
-        for item in old_recipients:
-            all_recipients.append(item)
-        # avoid the new recipients redirect it to same targets
-        self.info(msg='append new recipients: %s, %s => %s' % (receiver, new_recipients, all_recipients))
-        for item in new_recipients:
-            all_recipients.append(item)
+            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
@@ -230,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
         #

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dimples
-Version: 0.5.7
+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.7 → dimples-0.5.8}/setup.py

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