dimples 1.0.2__tar.gz → 1.0.3__tar.gz

{dimples-1.0.2 → dimples-1.0.3}/PKG-INFO

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

{dimples-1.0.2 → dimples-1.0.3}/dimples/client/network/state.py

@@ -107,7 +107,7 @@ class StateMachine(AutoMachine, Context):
 
 
 class StateOrder(IntEnum):
-    """ Connection State Order """
+    """ Session State Order """
     INIT = 0  # default
     CONNECTING = 1
     CONNECTED = 2

{dimples-1.0.2 → dimples-1.0.3}/dimples/client/terminal.py

@@ -125,7 +125,7 @@ class Terminal(DaemonRunner, DeviceMixin, Logging, StateDelegate):
     async def exit_state(self, state: SessionState, ctx: StateMachine, now: float):
         # called after state changed
         current = ctx.current_state
-        self.info(msg='server state changed: %s -> %s' % (state, current))
+        self.info(msg='server state changed: %s -> %s, %s' % (state, current, self.session.station))
         if isinstance(current, SessionState):
             index = current.index
         else:

{dimples-1.0.2 → dimples-1.0.3}/dimples/edge/octopus.py

@@ -380,13 +380,22 @@ def create_messenger(facebook: ClientFacebook, database: MessageDBI,
 def create_terminal(messenger: OctopusMessenger) -> Terminal:
     terminal = Terminal(messenger=messenger)
     messenger.terminal = terminal
-    thr = threading.Thread(target=_start_terminal, args=(terminal,))
+    thr = threading.Thread(target=__start_terminal, args=(terminal,), daemon=True)
     thr.start()
     return terminal
 
 
-def _start_terminal(terminal: Terminal):
-    Runner.sync_run(main=terminal.start())
+def __start_terminal(terminal: Terminal):
+    Runner.sync_run(main=__run_terminal(terminal=terminal))
+
+
+async def __run_terminal(terminal: Terminal):
+    await terminal.start()
+    while True:
+        await Runner.sleep(seconds=2.0)
+        if not terminal.running:
+            break
+    Log.warning(msg='terminal stopped: %s' % terminal)
 
 
 async def update_station(station: Station, database: SessionDBI):

{dimples-1.0.2 → dimples-1.0.3}/dimples/edge/shared.py

@@ -110,13 +110,14 @@ async def create_database(config: Config) -> Tuple[AccountDBI, MessageDBI, Sessi
     adb.show_info()
     mdb.show_info()
     sdb.show_info()
-    # default provider
+    # update neighbor stations (default provider)
     provider = ProviderInfo.GSP
-    # add neighbors
     neighbors = config.neighbors
-    for node in neighbors:
-        print('adding neighbor node: %s' % node)
-        await sdb.add_station(identifier=None, host=node.host, port=node.port, provider=provider)
+    if len(neighbors) > 0:
+        await sdb.remove_stations(provider=provider)
+        for node in neighbors:
+            print('adding neighbor node: %s' % node)
+            await sdb.add_station(identifier=None, host=node.host, port=node.port, provider=provider)
     return adb, mdb, sdb
 
 

{dimples-1.0.2 → dimples-1.0.3}/dimples/edge/start.py

@@ -77,6 +77,7 @@ async def main():
     await octopus.start()
     while octopus.running:
         await Runner.sleep(seconds=1.0)
+    Log.warning(msg='bot stopped: %s' % octopus)
 
 
 if __name__ == '__main__':

{dimples-1.0.2 → dimples-1.0.3}/dimples/station/shared.py

@@ -117,13 +117,14 @@ async def create_database(config: Config) -> Tuple[AccountDBI, MessageDBI, Sessi
     adb.show_info()
     mdb.show_info()
     sdb.show_info()
-    # default provider
+    # update neighbor stations (default provider)
     provider = ProviderInfo.GSP
-    # add neighbors
     neighbors = config.neighbors
-    for node in neighbors:
-        print('adding neighbor node: %s' % node)
-        await sdb.add_station(identifier=None, host=node.host, port=node.port, provider=provider)
+    if len(neighbors) > 0:
+        await sdb.remove_stations(provider=provider)
+        for node in neighbors:
+            print('adding neighbor node: %s' % node)
+            await sdb.add_station(identifier=None, host=node.host, port=node.port, provider=provider)
     return adb, mdb, sdb
 
 

{dimples-1.0.2 → dimples-1.0.3}/dimples.egg-info/PKG-INFO

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

{dimples-1.0.2 → dimples-1.0.3}/setup.py

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