dimples 1.0.2__tar.gz → 1.1.0__tar.gz

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

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

{dimples-1.0.2 → dimples-1.1.0}/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.1.0}/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.1.0}/dimples/edge/octopus.py

@@ -380,15 +380,10 @@ 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.start()
+    Runner.thread_run(terminal)
     return terminal
 
 
-def _start_terminal(terminal: Terminal):
-    Runner.sync_run(main=terminal.start())
-
-
 async def update_station(station: Station, database: SessionDBI):
     Log.info(msg='update station: %s' % station)
     # SP ID

{dimples-1.0.2 → dimples-1.1.0}/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.1.0}/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.1.0}/dimples/server/dispatcher.py

@@ -133,7 +133,8 @@ class Dispatcher(MessageDeliver, Logging):
             assert db is not None, 'dispatcher not initialized'
             runner = Roamer(database=db)
             self.__roamer = runner
-            Runner.async_run(coroutine=runner.start())
+            # Runner.async_run(coroutine=runner.start())
+            Runner.thread_run(runner)
         return runner
 
     def add_roaming(self, user: ID, station: ID) -> bool:

{dimples-1.0.2 → dimples-1.1.0}/dimples/server/push.py

@@ -124,7 +124,8 @@ class PushCenter(DaemonRunner, Logging):
         self.__queue = MessageQueue()
         self.__keeper = BadgeKeeper()
         self.__service: Optional[PushService] = None
-        Runner.async_run(coroutine=self.start())
+        # Runner.async_run(coroutine=self.start())
+        Runner.thread_run(self)
 
     @property
     def service(self) -> Optional[PushService]:

{dimples-1.0.2 → dimples-1.1.0}/dimples/server/session.py

@@ -95,7 +95,9 @@ class ServerSession(BaseSession):
         if super().set_identifier(identifier=identifier):
             session_change_id(session=self, new_id=identifier, old_id=old)
             # load cached message asynchronously
-            Runner.async_run(coroutine=load_cached_messages(session=self))
+            crt = load_cached_messages(session=self)
+            # Runner.async_run(coroutine=crt)
+            Runner.thread_run(crt)
             return True
 
     # Override
@@ -103,7 +105,9 @@ class ServerSession(BaseSession):
         if super().set_active(active=active, when=when):
             session_change_active(session=self, active=active)
             # load cached message asynchronously
-            Runner.async_run(coroutine=load_cached_messages(session=self))
+            crt = load_cached_messages(session=self)
+            # Runner.async_run(coroutine=crt)
+            Runner.thread_run(crt)
             return True
 
     # Override

{dimples-1.0.2 → dimples-1.1.0}/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.1.0}/dimples/utils/__init__.py

@@ -33,6 +33,7 @@
                                              -- Albert Moky @ Jan. 23, 2019
 """
 
+import threading
 from typing import Optional, List, Dict
 
 from dimsdk import md5, sha1, sha256, keccak256, ripemd160
@@ -142,3 +143,37 @@ __all__ = [
     'template_replace',
 
 ]
+
+
+#
+#   Patch for Runner
+#
+async def _run_forever(runner: Runner):
+    await runner.start()
+    while True:
+        await Runner.sleep(seconds=2.0)
+        if not runner.running:
+            break
+    Log.warning(msg='runner stopped: %s' % runner)
+
+
+def _start_runner(runner: Runner):
+    Runner.sync_run(main=_run_forever(runner=runner))
+
+
+def _start_coroutine(coroutine):
+    Runner.sync_run(main=coroutine)
+
+
+def _bg_run(target):
+    if isinstance(target, Runner):
+        fn = _start_runner
+    else:
+        fn = _start_coroutine
+    thr = threading.Thread(target=fn, args=(target,), daemon=True)
+    thr.start()
+    return thr
+
+
+""" Run coroutine in background thread """
+Runner.thread_run = _bg_run

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

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

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

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