dimples 0.4.2__tar.gz → 0.4.3__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dimples
-Version: 0.4.2
+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.2 → 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.2 → 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.2 → dimples-0.4.3}/dimples/conn/gatekeeper.py

@@ -58,7 +58,7 @@ 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_channel(self, remote: Optional[SocketAddress], local: Optional[SocketAddress]) -> Optional[Channel]:
@@ -92,7 +92,7 @@ class StreamServerHub(ServerHub):
 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]:

{dimples-0.4.2 → 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.2 → dimples-0.4.3}/dimples.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dimples
-Version: 0.4.2
+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.2 → 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.2
-tcp>=1.0.2
-udp>=1.0.2
+startrek>=1.0.3
+tcp>=1.0.3
+udp>=1.0.3

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

@@ -14,7 +14,7 @@ import io
 
 from setuptools import setup, find_packages
 
-__version__ = '0.4.2'
+__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.2',
-        'tcp>=1.0.2',
-        'udp>=1.0.2',
+        'startrek>=1.0.3',
+        'tcp>=1.0.3',
+        'udp>=1.0.3',
     ]
 )