dimples 1.3.1__tar.gz → 1.3.3__tar.gz

{dimples-1.3.1 → dimples-1.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dimples
-Version: 1.3.1
+Version: 1.3.3
 Summary: DIMP Library for Edges and Stations
 Home-page: https://github.com/dimchat/demo-py
 Author: Albert Moky
@@ -30,16 +30,16 @@ Description: # DIMP Library for Edges and Stations (Python version)
                 # 'pycryptodome',  # 3.14.1
                 # 'base58',  # 1.0.3
                 # 'ecdsa',   # 0.16.1
-                'dimplugins>=2.2.1',
+                'dimplugins>=2.2.2',
         
-                'dimsdk>=2.2.1',
-                # 'dimp>=2.2.1',
-                # 'dkd>=2.2.1',
-                # 'mkm>=2.2.1',
+                'dimsdk>=2.2.2',
+                # 'dimp>=2.2.2',
+                # 'dkd>=2.2.2',
+                # 'mkm>=2.2.2',
         
-                'startrek>=2.2.1',
-                'tcp>=2.2.1',
-                'udp>=2.2.1',
+                'startrek>=2.2.2',
+                'tcp>=2.2.2',
+                'udp>=2.2.2',
         
                 'aiou>=0.3.0',
             ]

{dimples-1.3.1 → dimples-1.3.3}/README.md

@@ -22,16 +22,16 @@
         # 'pycryptodome',  # 3.14.1
         # 'base58',  # 1.0.3
         # 'ecdsa',   # 0.16.1
-        'dimplugins>=2.2.1',
+        'dimplugins>=2.2.2',
 
-        'dimsdk>=2.2.1',
-        # 'dimp>=2.2.1',
-        # 'dkd>=2.2.1',
-        # 'mkm>=2.2.1',
+        'dimsdk>=2.2.2',
+        # 'dimp>=2.2.2',
+        # 'dkd>=2.2.2',
+        # 'mkm>=2.2.2',
 
-        'startrek>=2.2.1',
-        'tcp>=2.2.1',
-        'udp>=2.2.1',
+        'startrek>=2.2.2',
+        'tcp>=2.2.2',
+        'udp>=2.2.2',
 
         'aiou>=0.3.0',
     ]

{dimples-1.3.1 → dimples-1.3.3}/dimples/common/facebook.py

@@ -100,7 +100,7 @@ class CommonFacebook(Facebook, Logging, ABC):
                 archivist.current_user = user
         return user
 
-    def set_current_user(self, user: User):
+    async def set_current_user(self, user: User):
         if user.data_source is None:
             user.data_source = self
         self.archivist.current_user = user

{dimples-1.3.1 → dimples-1.3.3}/dimples/conn/flexible.py

@@ -28,7 +28,7 @@
 # SOFTWARE.
 # ==============================================================================
 
-from typing import Optional, Union, List
+from typing import Optional, List
 
 from startrek.types import SocketAddress
 from startrek.skywalker import Runner
@@ -140,13 +140,13 @@ class FlexiblePorter(StarPorter, DeparturePacker, Logging):
             return await docker.process()
 
     # Override
-    async def send_data(self, payload: Union[bytes, bytearray]) -> bool:
+    async def send_data(self, payload: bytes) -> bool:
         docker = self.__porter
         if docker is None:
             self.error(msg='docker not ready, failed to send payload: %s' % payload)
             return False
         elif isinstance(docker, WSPorter):
-            ship = docker.pack(payload=payload)
+            ship = docker.pack(payload=payload, priority=0, needs_respond=True)
             return await docker.send_ship(ship=ship)
         elif isinstance(docker, MTPStreamPorter):
             # sn = TransactionID.from_data(data=ship.sn)
@@ -170,11 +170,11 @@ class FlexiblePorter(StarPorter, DeparturePacker, Logging):
             await docker.heartbeat()
 
     # Override
-    def pack(self, payload: bytes, priority: int = 0) -> Optional[Departure]:
+    def pack(self, payload: bytes, priority: int, needs_respond: bool) -> Optional[Departure]:
         docker = self.__porter
         if docker is None:
             self.error(msg='docker not ready, failed to pack: %s' % payload)
             return None
         else:
             assert isinstance(docker, DeparturePacker), 'docker error: %s' % docker
-        return docker.pack(payload=payload, priority=priority)
+        return docker.pack(payload=payload, priority=priority, needs_respond=needs_respond)

{dimples-1.3.1 → dimples-1.3.3}/dimples/conn/gate.py

@@ -116,7 +116,7 @@ class CommonGate(StarGate, Logging, Generic[H], ABC):
             ship = MarsStreamPorter.create_departure(mars=mars)
             return await worker.send_ship(ship=ship)
         elif isinstance(worker, WSPorter):
-            ship = worker.pack(payload=payload)
+            ship = worker.pack(payload=payload, priority=1, needs_respond=False)
             return await worker.send_ship(ship=ship)
         else:
             raise LookupError('docker error (%s, %s): %s' % (remote, local, worker))

{dimples-1.3.1 → dimples-1.3.3}/dimples/conn/gatekeeper.py

@@ -261,7 +261,7 @@ class GateKeeper(Runner, PorterDelegate, Logging):
     async def _porter_pack(self, payload: bytes, priority: int = 0) -> Optional[Departure]:
         docker = await self.gate.fetch_porter(remote=self.remote_address, local=None)
         assert isinstance(docker, DeparturePacker), 'departure packer error: %s' % docker
-        return docker.pack(payload=payload, priority=priority)
+        return docker.pack(payload=payload, priority=priority, needs_respond=True)
 
     def _queue_append(self, msg: ReliableMessage, ship: Departure) -> bool:
         return self.__queue.append(msg=msg, ship=ship)

{dimples-1.3.1 → dimples-1.3.3}/dimples/conn/mars.py

@@ -292,7 +292,7 @@ class MarsStreamPorter(PlainPorter, DeparturePacker):
         pass
 
     # Override
-    def pack(self, payload: bytes, priority: int = 0) -> Optional[Departure]:
+    def pack(self, payload: bytes, priority: int, needs_respond: bool) -> Optional[Departure]:
         mars = MarsHelper.create_push(payload=payload)
         return self.create_departure(mars=mars, priority=priority)
 

{dimples-1.3.1 → dimples-1.3.3}/dimples/conn/mtp.py

@@ -197,7 +197,7 @@ class MTPStreamPorter(PackagePorter, DeparturePacker):
         return MTPHelper.respond_message(sn=sn, pages=pages, index=index, body=OK)
 
     # Override
-    def pack(self, payload: bytes, priority: int = 0) -> Optional[Departure]:
+    def pack(self, payload: bytes, priority: int, needs_respond: bool) -> Optional[Departure]:
         pkg = MTPHelper.create_message(body=payload)
         return self._create_departure(pack=pkg, priority=priority)
 

{dimples-1.3.1 → dimples-1.3.3}/dimples/conn/protocol/__init__.py

@@ -40,7 +40,7 @@ from .mars import NetMsg, NetMsgHead, NetMsgSeq
 class DeparturePacker(ABC):
 
     @abstractmethod
-    def pack(self, payload: bytes, priority: int = 0) -> Optional[Departure]:
+    def pack(self, payload: bytes, priority: int, needs_respond: bool) -> Optional[Departure]:
         raise NotImplemented
 
 

{dimples-1.3.1 → dimples-1.3.3}/dimples/conn/ws.py

@@ -35,7 +35,7 @@ from typing import Optional, List, Tuple
 from startrek.types import SocketAddress
 from startrek.skywalker import Runner
 from startrek import Arrival, Departure
-from startrek import ArrivalShip, DepartureShip, DeparturePriority
+from startrek import ArrivalShip, DepartureShip
 from startrek import BaseConnection, BaseChannel
 
 from tcp import PlainPorter
@@ -51,6 +51,18 @@ class WSArrival(ArrivalShip):
         self.__package = package
         self.__payload = payload
 
+    # Override
+    def __str__(self) -> str:
+        clazz = self.__class__.__name__
+        size = len(self.__package)
+        return '<%s size=%d />' % (clazz, size)
+
+    # Override
+    def __repr__(self) -> str:
+        clazz = self.__class__.__name__
+        size = len(self.__package)
+        return '<%s size=%d />' % (clazz, size)
+
     @property
     def package(self) -> bytes:
         return self.__package
@@ -80,6 +92,18 @@ class WSDeparture(DepartureShip):
         self.__payload = payload
         self.__important = important
 
+    # Override
+    def __str__(self) -> str:
+        clazz = self.__class__.__name__
+        size = len(self.__package)
+        return '<%s size=%d />' % (clazz, size)
+
+    # Override
+    def __repr__(self) -> str:
+        clazz = self.__class__.__name__
+        size = len(self.__package)
+        return '<%s size=%d />' % (clazz, size)
+
     @property
     def package(self) -> bytes:
         return self.__package
@@ -241,8 +265,7 @@ class WSPorter(PlainPorter, DeparturePacker):
         elif body_len == 4:
             if body == PING:
                 # 'PING' -> 'PONG'
-                ship = self.pack(payload=PONG, priority=DeparturePriority.SLOWER)
-                await self.send_ship(ship=ship)
+                await self.respond(payload=PONG)
                 return None
             elif body == PONG or body == NOOP:
                 # ignore
@@ -265,9 +288,13 @@ class WSPorter(PlainPorter, DeparturePacker):
         pass
 
     # Override
-    def pack(self, payload: bytes, priority: int = 0) -> Optional[Departure]:
+    def _create_departure(self, payload: bytes, priority: int, needs_respond: bool) -> Departure:
+        return self.pack(payload=payload, priority=priority, needs_respond=needs_respond)
+
+    # Override
+    def pack(self, payload: bytes, priority: int, needs_respond: bool) -> Optional[Departure]:
         req_pack = WebSocket.pack(payload=payload)
-        important = self.__ack_enable
+        important = needs_respond and self.__ack_enable
         return WSDeparture(package=req_pack, payload=payload, priority=priority, important=important)
 
     @classmethod

{dimples-1.3.1 → dimples-1.3.3}/dimples/edge/shared.py

@@ -86,6 +86,9 @@ class GlobalVariable:
     @messenger.setter
     def messenger(self, transceiver: ClientMessenger):
         self.__messenger = transceiver
+        # set for group manager
+        man = SharedGroupManager()
+        man.messenger = transceiver
         # set for entity checker
         checker = self.facebook.checker
         assert isinstance(checker, ClientChecker), 'entity checker error: %s' % checker
@@ -130,7 +133,7 @@ class GlobalVariable:
             visa = Document.parse(document=visa.copy_dictionary())
             visa.sign(private_key=sign_key)
             await facebook.save_document(document=visa)
-        facebook.set_current_user(user=user)
+        await facebook.set_current_user(user=user)
 
 
 def create_redis_connector(config: Config) -> Optional[RedisConnector]:
@@ -178,7 +181,7 @@ async def create_database(config: Config) -> Tuple[AccountDBI, MessageDBI, Sessi
                     found = True
                     break
             if not found:
-                print('removing neighbor station: %s' % old)
+                print('removing neighbor station: %s, %s' % (old, provider))
                 await sdb.remove_station(host=old.host, port=old.port, provider=provider)
         # 2. add new neighbors
         for node in neighbors:
@@ -188,8 +191,9 @@ async def create_database(config: Config) -> Tuple[AccountDBI, MessageDBI, Sessi
                     found = True
                     break
             if not found:
-                print('adding neighbor node: %s' % node)
+                print('adding neighbor node: %s -> %s' % (node, provider))
                 await sdb.add_station(identifier=None, host=node.host, port=node.port, provider=provider)
+    # OK
     return adb, mdb, sdb
 
 

{dimples-1.3.1 → dimples-1.3.3}/dimples/server/facebook.py

@@ -34,6 +34,7 @@ from typing import Optional, List
 
 from dimsdk import ID, User
 
+from ..common import BroadcastUtils
 from ..common import CommonFacebook
 
 
@@ -67,16 +68,31 @@ class ServerFacebook(CommonFacebook):
 
     # Override
     async def get_founder(self, identifier: ID) -> Optional[ID]:
+        assert identifier.is_group, 'group ID error: %s' % identifier
+        # check broadcast group
+        if identifier.is_broadcast:
+            # founder of broadcast group
+            return BroadcastUtils.broadcast_founder(group=identifier)
         self.error(msg='DO NOT CALL ME: %s' % identifier)
         return None
 
     # Override
     async def get_owner(self, identifier: ID) -> Optional[ID]:
+        assert identifier.is_group, 'group ID error: %s' % identifier
+        # check broadcast group
+        if identifier.is_broadcast:
+            # owner of broadcast group
+            return BroadcastUtils.broadcast_owner(group=identifier)
         self.error(msg='DO NOT CALL ME: %s' % identifier)
         return None
 
     # Override
     async def get_members(self, identifier: ID) -> List[ID]:
+        assert identifier.is_group, 'group ID error: %s' % identifier
+        # check broadcast group
+        if identifier.is_broadcast:
+            # members of broadcast group
+            return BroadcastUtils.broadcast_members(group=identifier)
         self.error(msg='DO NOT CALL ME: %s' % identifier)
         return []
 

{dimples-1.3.1 → dimples-1.3.3}/dimples/station/shared.py

@@ -90,6 +90,9 @@ class GlobalVariable:
     @messenger.setter
     def messenger(self, transceiver: ServerMessenger):
         self.__messenger = transceiver
+        # set for group manager
+        man = SharedGroupManager()
+        man.messenger = transceiver
         # set for entity checker
         checker = self.facebook.checker
         assert isinstance(checker, ServerChecker), 'entity checker error: %s' % checker
@@ -128,6 +131,12 @@ class GlobalVariable:
         dispatcher.facebook = facebook
         dispatcher.deliver = deliver
         dispatcher.roamer = roamer
+        # this messenger is only for encryption, so don't need a session
+        messenger = create_messenger(facebook=facebook, database=mdb, session=None)
+        self.__messenger = messenger
+        checker = facebook.checker
+        assert isinstance(checker, ServerChecker), 'entity checker error: %s' % checker
+        checker.messenger = messenger
 
     async def login(self, current_user: ID):
         facebook = self.facebook
@@ -145,7 +154,7 @@ class GlobalVariable:
             visa = Document.parse(document=visa.copy_dictionary())
             visa.sign(private_key=sign_key)
             await facebook.save_document(document=visa)
-        facebook.set_current_user(user=user)
+        await facebook.set_current_user(user=user)
 
 
 def create_redis_connector(config: Config) -> Optional[RedisConnector]:
@@ -205,6 +214,7 @@ async def create_database(config: Config) -> Tuple[AccountDBI, MessageDBI, Sessi
             if not found:
                 print('adding neighbor node: %s' % node)
                 await sdb.add_station(identifier=None, host=node.host, port=node.port, provider=provider)
+    # OK
     return adb, mdb, sdb
 
 

{dimples-1.3.1 → dimples-1.3.3}/dimples.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dimples
-Version: 1.3.1
+Version: 1.3.3
 Summary: DIMP Library for Edges and Stations
 Home-page: https://github.com/dimchat/demo-py
 Author: Albert Moky
@@ -30,16 +30,16 @@ Description: # DIMP Library for Edges and Stations (Python version)
                 # 'pycryptodome',  # 3.14.1
                 # 'base58',  # 1.0.3
                 # 'ecdsa',   # 0.16.1
-                'dimplugins>=2.2.1',
+                'dimplugins>=2.2.2',
         
-                'dimsdk>=2.2.1',
-                # 'dimp>=2.2.1',
-                # 'dkd>=2.2.1',
-                # 'mkm>=2.2.1',
+                'dimsdk>=2.2.2',
+                # 'dimp>=2.2.2',
+                # 'dkd>=2.2.2',
+                # 'mkm>=2.2.2',
         
-                'startrek>=2.2.1',
-                'tcp>=2.2.1',
-                'udp>=2.2.1',
+                'startrek>=2.2.2',
+                'tcp>=2.2.2',
+                'udp>=2.2.2',
         
                 'aiou>=0.3.0',
             ]

dimples-1.3.3/dimples.egg-info/requires.txt

@@ -0,0 +1,6 @@
+dimplugins>=2.2.2
+dimsdk>=2.2.2
+startrek>=2.2.2
+tcp>=2.2.2
+udp>=2.2.2
+aiou>=0.3.0

{dimples-1.3.1 → dimples-1.3.3}/setup.py

@@ -14,7 +14,7 @@ import io
 
 from setuptools import setup, find_packages
 
-__version__ = '1.3.1'
+__version__ = '1.3.3'
 __author__ = 'Albert Moky'
 __contact__ = 'albert.moky@gmail.com'
 
@@ -51,16 +51,16 @@ setup(
         # 'pycryptodome',  # 3.14.1
         # 'base58',  # 1.0.3
         # 'ecdsa',   # 0.16.1
-        'dimplugins>=2.2.1',
+        'dimplugins>=2.2.2',
 
-        'dimsdk>=2.2.1',
-        # 'dimp>=2.2.1',
-        # 'dkd>=2.2.1',
-        # 'mkm>=2.2.1',
+        'dimsdk>=2.2.2',
+        # 'dimp>=2.2.2',
+        # 'dkd>=2.2.2',
+        # 'mkm>=2.2.2',
 
-        'startrek>=2.2.1',
-        'tcp>=2.2.1',
-        'udp>=2.2.1',
+        'startrek>=2.2.2',
+        'tcp>=2.2.2',
+        'udp>=2.2.2',
 
         'aiou>=0.3.0',
     ]

dimples-1.3.1/dimples.egg-info/requires.txt

@@ -1,6 +0,0 @@
-dimplugins>=2.2.1
-dimsdk>=2.2.1
-startrek>=2.2.1
-tcp>=2.2.1
-udp>=2.2.1
-aiou>=0.3.0