dimples 1.2.6__tar.gz → 1.2.7__tar.gz

dimples-1.2.7/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2022 Albert Moky
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

dimples-1.2.7/PKG-INFO

@@ -0,0 +1,31 @@
+Metadata-Version: 2.1
+Name: dimples
+Version: 1.2.7
+Summary: DIMP Library for Edges and Stations
+Home-page: https://github.com/dimchat/demo-py
+Author: Albert Moky
+Author-email: albert.moky@gmail.com
+License: MIT
+Classifier: Programming Language :: Python :: 3
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Operating System :: OS Independent
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: dimplugins>=2.0.0
+Requires-Dist: dimsdk>=2.0.0
+Requires-Dist: dimp>=2.0.0
+Requires-Dist: dkd>=2.0.0
+Requires-Dist: mkm>=2.0.0
+Requires-Dist: startrek>=2.2.0
+Requires-Dist: tcp>=2.2.0
+Requires-Dist: udp>=2.2.0
+Requires-Dist: aiou>=0.3.0
+
+# DIMP Library for Edges and Stations (Python version)
+
+[![license](https://img.shields.io/github/license/mashape/apistatus.svg)](https://github.com/dimchat/demo-py/blob/master/LICENSE)
+[![Version](https://img.shields.io/badge/alpha-0.1.0-red.svg)](https://github.com/dimchat/demo-py/wiki)
+[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/dimchat/demo-py/pulls)
+[![Platform](https://img.shields.io/badge/Platform-Python%203-brightgreen.svg)](https://github.com/dimchat/demo-py/wiki)
+
+Copyright © 2018-2022 Albert Moky

{dimples-1.2.6 → dimples-1.2.7}/dimples/conn/flexible.py

@@ -87,9 +87,6 @@ class FlexiblePorter(StarPorter, DeparturePacker, Logging):
             coro = docker.set_connection(conn=self.connection)
             Runner.async_task(coro=coro)
             self.__porter = docker
-            if isinstance(docker, WSPorter):
-                # ignore first handshake package
-                return None
         # OK
         return await docker.process_received(data=data)
 

{dimples-1.2.6 → dimples-1.2.7}/dimples/register/shared.py

@@ -123,12 +123,12 @@ async def modify(identifier: ID, database: AccountDBI):
     #   Step 1: create account
     #
     account = create_account(network=network, database=database)
-    meta, doc = account.load_info(identifier=identifier)
+    meta, doc = await account.load_info(identifier=identifier)
     if isinstance(account, GroupAccount):
         assert isinstance(doc, Bulletin), 'group document error: %s' % doc
         founder = doc.founder
         assert founder is not None, 'founder not found: %s' % doc
-        account.load_founder(founder=founder)
+        await account.load_founder(founder=founder)
     #
     #   Step 2. edit & save
     #

{dimples-1.2.6 → dimples-1.2.7}/dimples/server/session.py

@@ -36,6 +36,7 @@
 """
 
 import socket
+import threading
 import traceback
 from typing import Optional, List, Tuple
 
@@ -84,6 +85,7 @@ class ServerSession(BaseSession):
     def __init__(self, remote: Tuple[str, int], sock: socket.socket, database: SessionDBI):
         super().__init__(remote=remote, sock=sock, database=database)
         self.__key = generate_session_key()
+        self.__loader = OfflineMessageLoader()
 
     @property
     def key(self) -> str:
@@ -100,28 +102,16 @@ class ServerSession(BaseSession):
         old = self.identifier
         if super().set_identifier(identifier=identifier):
             session_change_id(session=self, new_id=identifier, old_id=old)
-            self._load_cached_messages()
+            self.__loader.load_cached_messages(session=self)
             return True
 
     # Override
     def set_active(self, active: bool, when: float = None) -> bool:
         if super().set_active(active=active, when=when):
             session_change_active(session=self, active=active)
-            self._load_cached_messages()
+            self.__loader.load_cached_messages(session=self)
             return True
 
-    def _load_cached_messages(self):
-        if self.identifier is None:
-            # user not login
-            return False
-        elif not self.active:
-            # session not active
-            return False
-        # load cached message asynchronously
-        coro = load_cached_messages(session=self)
-        # Runner.async_task(coro=coro)
-        Runner.async_thread(coro=coro).start()
-
     #
     #   Docker Delegate
     #
@@ -183,6 +173,36 @@ class ServerSession(BaseSession):
                 await remove_reliable_message(msg=msg, receiver=receiver, database=db)
 
 
+class OfflineMessageLoader:
+
+    def __init__(self):
+        super().__init__()
+        self.__lock = threading.Lock()
+        self.__thread = None
+
+    def load_cached_messages(self, session: ServerSession):
+        identifier = session.identifier
+        if identifier is None:
+            # user not login
+            return False
+        elif not session.active:
+            # session not active
+            return False
+        thr: threading.Thread = self.__thread
+        if thr is not None and thr.is_alive():
+            return False
+        with self.__lock:
+            thr = self.__thread
+            if thr is not None and thr.is_alive():
+                return False
+            # load cached message asynchronously
+            coro = _load_cached_messages(identifier=identifier, session=session)
+            thr = Runner.async_thread(coro=coro)
+            thr.start()
+            self.__thread = thr
+            return True
+
+
 def get_data_packages(ship: Arrival) -> List[bytes]:
     # get payload
     if isinstance(ship, MTPStreamArrival):
@@ -224,9 +244,7 @@ def session_change_active(session: ServerSession, active: bool):
         return True
 
 
-async def load_cached_messages(session: ServerSession):
-    identifier = session.identifier
-    assert identifier is not None and session.active, 'session error: %s' % session
+async def _load_cached_messages(identifier: ID, session: ServerSession):
     messenger = session.messenger
     db = messenger.database
     limit = ReliableMessageDBI.CACHE_LIMIT

{dimples-1.2.6 → dimples-1.2.7}/dimples/server/session_center.py

@@ -101,16 +101,16 @@ class SessionPool(Logging):
         candidates = set()
         clone_addresses = set(all_addresses)  # copy
         for remote in clone_addresses:
-            session = self.get_session(remote=remote)
+            session = self.__sessions.get(remote)
             if session is None:
                 self.warning(msg='session removed: %s, %s' % (identifier, remote))
                 all_addresses.discard(remote)
-                self.remove_address(identifier=identifier, remote=remote)
+                # self.remove_address(identifier=identifier, remote=remote)
                 continue
             elif session.identifier != identifier:
                 self.warning(msg='session reused: %s, %s, %s' % (identifier, remote, session))
                 all_addresses.discard(remote)
-                self.remove_address(identifier=identifier, remote=remote)
+                # self.remove_address(identifier=identifier, remote=remote)
                 continue
             # got it
             candidates.add(session)

{dimples-1.2.6 → dimples-1.2.7}/dimples/station/handler.py

@@ -46,33 +46,21 @@ class RequestHandler(StreamRequestHandler, Logging):
         DIM Request Handler
     """
 
-    def __del__(self):
-        self.info(msg='request removed: %s' % str(self.client_address))
-
-    # Override
-    def setup(self):
-        super().setup()
-        self.info(msg='request setup: %s' % str(self.client_address))
-
-    # Override
-    def finish(self):
-        super().finish()
-        self.info(msg='request finished: %s' % str(self.client_address))
-
     # Override
     def handle(self):
         super().handle()
         try:
             self.info(msg='session started: %s' % str(self.client_address))
-            crt = _start_session(client_address=self.client_address, request=self.request)
-            Runner.sync_run(main=crt)
+            Runner.sync_run(main=_start_session(handler=self))
             self.info(msg='session finished: %s' % str(self.client_address))
         except Exception as error:
             self.error(msg='request handler error: %s' % error)
             traceback.print_exc()
 
 
-async def _start_session(client_address, request):
+async def _start_session(handler: RequestHandler):
+    client_address = handler.client_address
+    request = handler.request
     shared = GlobalVariable()
     session = ServerSession(remote=client_address, sock=request, database=shared.sdb)
     messenger = create_messenger(facebook=shared.facebook, database=shared.mdb, session=session)

dimples-1.2.7/dimples.egg-info/PKG-INFO

@@ -0,0 +1,31 @@
+Metadata-Version: 2.1
+Name: dimples
+Version: 1.2.7
+Summary: DIMP Library for Edges and Stations
+Home-page: https://github.com/dimchat/demo-py
+Author: Albert Moky
+Author-email: albert.moky@gmail.com
+License: MIT
+Classifier: Programming Language :: Python :: 3
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Operating System :: OS Independent
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: dimplugins>=2.0.0
+Requires-Dist: dimsdk>=2.0.0
+Requires-Dist: dimp>=2.0.0
+Requires-Dist: dkd>=2.0.0
+Requires-Dist: mkm>=2.0.0
+Requires-Dist: startrek>=2.2.0
+Requires-Dist: tcp>=2.2.0
+Requires-Dist: udp>=2.2.0
+Requires-Dist: aiou>=0.3.0
+
+# DIMP Library for Edges and Stations (Python version)
+
+[![license](https://img.shields.io/github/license/mashape/apistatus.svg)](https://github.com/dimchat/demo-py/blob/master/LICENSE)
+[![Version](https://img.shields.io/badge/alpha-0.1.0-red.svg)](https://github.com/dimchat/demo-py/wiki)
+[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/dimchat/demo-py/pulls)
+[![Platform](https://img.shields.io/badge/Platform-Python%203-brightgreen.svg)](https://github.com/dimchat/demo-py/wiki)
+
+Copyright © 2018-2022 Albert Moky

{dimples-1.2.6 → dimples-1.2.7}/dimples.egg-info/SOURCES.txt

@@ -1,3 +1,4 @@
+LICENSE
 README.md
 setup.py
 dimples/__init__.py

{dimples-1.2.6 → dimples-1.2.7}/dimples.egg-info/entry_points.txt

@@ -2,4 +2,3 @@
 dime = dimples.edge.start:main
 dimid = dimples.register.run:main
 dims = dimples.station.start:main
-

{dimples-1.2.6 → dimples-1.2.7}/setup.py

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

dimples-1.2.6/PKG-INFO

@@ -1,22 +0,0 @@
-Metadata-Version: 2.1
-Name: dimples
-Version: 1.2.6
-Summary: DIMP Library for Edges and Stations
-Home-page: https://github.com/dimchat/demo-py
-Author: Albert Moky
-Author-email: albert.moky@gmail.com
-License: MIT
-Description: # DIMP Library for Edges and Stations (Python version)
-        
-        [![license](https://img.shields.io/github/license/mashape/apistatus.svg)](https://github.com/dimchat/demo-py/blob/master/LICENSE)
-        [![Version](https://img.shields.io/badge/alpha-0.1.0-red.svg)](https://github.com/dimchat/demo-py/wiki)
-        [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/dimchat/demo-py/pulls)
-        [![Platform](https://img.shields.io/badge/Platform-Python%203-brightgreen.svg)](https://github.com/dimchat/demo-py/wiki)
-        
-        Copyright © 2018-2022 Albert Moky
-        
-Platform: UNKNOWN
-Classifier: Programming Language :: Python :: 3
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Operating System :: OS Independent
-Description-Content-Type: text/markdown

dimples-1.2.6/dimples.egg-info/PKG-INFO

@@ -1,22 +0,0 @@
-Metadata-Version: 2.1
-Name: dimples
-Version: 1.2.6
-Summary: DIMP Library for Edges and Stations
-Home-page: https://github.com/dimchat/demo-py
-Author: Albert Moky
-Author-email: albert.moky@gmail.com
-License: MIT
-Description: # DIMP Library for Edges and Stations (Python version)
-        
-        [![license](https://img.shields.io/github/license/mashape/apistatus.svg)](https://github.com/dimchat/demo-py/blob/master/LICENSE)
-        [![Version](https://img.shields.io/badge/alpha-0.1.0-red.svg)](https://github.com/dimchat/demo-py/wiki)
-        [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/dimchat/demo-py/pulls)
-        [![Platform](https://img.shields.io/badge/Platform-Python%203-brightgreen.svg)](https://github.com/dimchat/demo-py/wiki)
-        
-        Copyright © 2018-2022 Albert Moky
-        
-Platform: UNKNOWN
-Classifier: Programming Language :: Python :: 3
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Operating System :: OS Independent
-Description-Content-Type: text/markdown