dimples 1.2.3__tar.gz → 1.2.4__tar.gz

dimples-1.2.4/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.4/PKG-INFO

@@ -0,0 +1,31 @@
+Metadata-Version: 2.1
+Name: dimples
+Version: 1.2.4
+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.1.1
+Requires-Dist: tcp>=2.1.1
+Requires-Dist: udp>=2.1.1
+Requires-Dist: aiou>=0.1.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.3 → dimples-1.2.4}/dimples/conn/flexible.py

@@ -36,6 +36,7 @@ from startrek import Connection
 from startrek import Arrival, Departure
 from startrek import StarDocker
 
+from ..utils import Logging
 from .protocol import DeparturePacker
 
 from .ws import WSDocker
@@ -43,7 +44,7 @@ from .mtp import MTPStreamDocker, TransactionID, MTPHelper
 from .mars import MarsStreamDocker, MarsHelper
 
 
-class FlexibleDocker(StarDocker, DeparturePacker):
+class FlexibleDocker(StarDocker, DeparturePacker, Logging):
 
     def __init__(self, remote: SocketAddress, local: Optional[SocketAddress]):
         super().__init__(remote=remote, local=local)
@@ -61,7 +62,7 @@ class FlexibleDocker(StarDocker, DeparturePacker):
         elif MarsStreamDocker.check(data=data):
             docker = MarsStreamDocker(remote=self.remote_address, local=self.local_address)
         else:
-            print('[FlexibleDocker] unsupported data format: %s' % data)
+            self.error(msg='unsupported data format: %s' % data)
             return None
         # OK
         docker.delegate = self.delegate
@@ -74,19 +75,26 @@ class FlexibleDocker(StarDocker, DeparturePacker):
     async def set_connection(self, conn: Optional[Connection]):
         await super().set_connection(conn=conn)
         docker = self.__docker
-        if docker is not None:
+        if docker is None:
+            self.error(msg='docker not ready, failed to set connection: %s' % conn)
+        else:
             await docker.set_connection(conn=conn)
 
     # Override
     async def send_ship(self, ship: Departure) -> bool:
         docker = self.__docker
-        if docker is not None:
+        if docker is None:
+            self.error(msg='docker not ready, failed to send ship: %s' % ship)
+            return False
+        else:
             return await docker.send_ship(ship=ship)
 
     # Override
     async def process_received(self, data: bytes):
         docker = self._get_docker(data=data)
-        if docker is not None:
+        if docker is None:
+            self.error(msg='docker not ready, failed to process received: %s' % data)
+        else:
             return await docker.process_received(data=data)
 
     # Override
@@ -113,7 +121,9 @@ class FlexibleDocker(StarDocker, DeparturePacker):
     def purge(self, now: float = 0) -> int:
         cnt = super().purge(now=now)
         docker = self.__docker
-        if docker is not None:
+        if docker is None:
+            self.warning(msg='docker not ready, failed to purge')
+        else:
             cnt += docker.purge(now=now)
         return cnt
 
@@ -128,14 +138,17 @@ class FlexibleDocker(StarDocker, DeparturePacker):
     # Override
     async def process(self) -> bool:
         docker = self.__docker
-        if docker is not None:
+        if docker is None:
+            self.warning(msg='docker not ready, failed to process')
+            return False
+        else:
             return await docker.process()
 
     # Override
     async def send_data(self, payload: Union[bytes, bytearray]) -> bool:
         docker = self.__docker
         if docker is None:
-            # docker not ready
+            self.error(msg='docker not ready, failed to send payload: %s' % payload)
             return False
         elif isinstance(docker, WSDocker):
             ship = docker.pack(payload=payload)
@@ -156,13 +169,16 @@ class FlexibleDocker(StarDocker, DeparturePacker):
     # Override
     async def heartbeat(self):
         docker = self.__docker
-        if docker is not None:
+        if docker is None:
+            self.warning(msg='docker not ready, failed to heart bet')
+        else:
             await docker.heartbeat()
 
     # Override
     def pack(self, payload: bytes, priority: int = 0) -> Optional[Departure]:
         docker = self.__docker
         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

{dimples-1.2.3 → dimples-1.2.4}/dimples/server/session_center.py

@@ -42,11 +42,12 @@ from typing import Optional, Dict, Set, Tuple
 
 from dimsdk import ID
 
+from ..utils import Logging
 from ..utils import Singleton
 from ..common import Session
 
 
-class SessionPool:
+class SessionPool(Logging):
 
     def __init__(self):
         super().__init__()
@@ -93,6 +94,31 @@ class SessionPool:
     def remove_session(self, remote: Tuple[str, int]):
         self.__sessions.pop(remote, None)
 
+    def all_sessions(self, identifier: ID) -> Set[Session]:
+        all_addresses = self.__addresses.get(identifier)
+        if all_addresses is None:
+            return set()
+        candidates = set()
+        clone_addresses = set(all_addresses)  # copy
+        for remote in clone_addresses:
+            session = self.get_session(remote=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)
+                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)
+                continue
+            # got it
+            candidates.add(session)
+        if len(all_addresses) == 0:
+            # remote addresses empty, remote it from cache
+            self.__addresses.pop(identifier, None)
+        return candidates
+
 
 @Singleton
 class SessionCenter:
@@ -107,15 +133,30 @@ class SessionCenter:
         with self.__lock:
             return self.__pool.all_users()
 
-    def get_session(self, remote: Tuple[str, int]) -> Optional[Session]:
-        """ Get session by remote address """
-        with self.__lock:
-            return self.__pool.get_session(remote=remote)
+    # def get_session(self, remote: Tuple[str, int]) -> Optional[Session]:
+    #     """ Get session by remote address """
+    #     with self.__lock:
+    #         return self.__pool.get_session(remote=remote)
 
     def add_session(self, session: Session):
         """ Cache session with remote address """
         with self.__lock:
+            remote = session.remote_address
+            # check old session
+            old = self.__pool.get_session(remote=remote)
+            if old is not None:
+                # remove old session with remote address
+                self.__pool.remove_session(remote=remote)
+                # remove remote address with ID if exists
+                oid = session.identifier
+                if oid is not None:
+                    self.__pool.remove_address(identifier=oid, remote=remote)
+            # add new session
             self.__pool.add_session(session=session)
+        if old is not None:
+            # set session inactive
+            old.set_active(active=False)
+        # assert session.identifier is None, 'new session error: %s' % session
         return True
 
     def remove_session(self, session: Session):
@@ -135,16 +176,16 @@ class SessionCenter:
 
     def update_session(self, session: Session, identifier: ID):
         """ Update ID in this session """
-        old = session.identifier
-        if old == identifier:
+        oid = session.identifier
+        if oid == identifier:
             # nothing changed
             return False
         address = session.remote_address
         assert address is not None, 'session error: %s' % session
         with self.__lock:
-            if old is not None:
+            if oid is not None:
                 # remove remote address from old ID
-                self.__pool.remove_address(identifier=old, remote=address)
+                self.__pool.remove_address(identifier=oid, remote=address)
             # insert remote address for new ID
             self.__pool.add_address(identifier=identifier, remote=address)
         # update session ID
@@ -155,30 +196,17 @@ class SessionCenter:
         """ Get all active sessions with user ID """
         actives: Set[Session] = set()
         with self.__lock:
-            discarded = set()
-            # get all addresses with ID
-            all_addresses = self.__pool.all_addresses(identifier=identifier)
-            for address in all_addresses:
-                # get session by each address
-                session = self.__pool.get_session(remote=address)
-                if session is None:
-                    # session gone, discard this address
-                    discarded.add(address)
-                elif session.active:
+            all_sessions = self.__pool.all_sessions(identifier=identifier)
+            for session in all_sessions:
+                if session.active:
                     actives.add(session)
-            # remove discarded addresses
-            for address in discarded:
-                all_addresses.discard(address)
         return actives
 
     def is_active(self, identifier: ID) -> bool:
         """ check whether user online """
         with self.__lock:
-            # get all addresses with ID
-            all_addresses = self.__pool.all_addresses(identifier=identifier)
-            for address in all_addresses:
-                # get session by each address
-                session = self.__pool.get_session(remote=address)
-                if session is not None and session.active:
+            all_sessions = self.__pool.all_sessions(identifier=identifier)
+            for session in all_sessions:
+                if session.active:
                     # got one active
                     return True

{dimples-1.2.3 → dimples-1.2.4}/dimples/utils/log.py

@@ -43,9 +43,9 @@ ERROR_FLAG = 0x08
 
 class Log:
 
-    DEBUG = 0xFF    # debug(), info(), warning(), error()
-    DEVELOP = 0xFE  # info(), warning(), error()
-    RELEASE = 0xFC  # warning(), error()
+    DEBUG = 0xFF    # 0000 1111 : debug(), info(), warning(), error()
+    DEVELOP = 0xFE  # 0000 1110 :          info(), warning(), error()
+    RELEASE = 0xFC  # 0000 1100 :                  warning(), error()
 
     LEVEL = RELEASE
 

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

@@ -0,0 +1,31 @@
+Metadata-Version: 2.1
+Name: dimples
+Version: 1.2.4
+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.1.1
+Requires-Dist: tcp>=2.1.1
+Requires-Dist: udp>=2.1.1
+Requires-Dist: aiou>=0.1.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.3 → dimples-1.2.4}/dimples.egg-info/SOURCES.txt

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

{dimples-1.2.3 → dimples-1.2.4}/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.3 → dimples-1.2.4}/setup.py

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

dimples-1.2.3/PKG-INFO

@@ -1,22 +0,0 @@
-Metadata-Version: 2.1
-Name: dimples
-Version: 1.2.3
-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.3/dimples.egg-info/PKG-INFO

@@ -1,22 +0,0 @@
-Metadata-Version: 2.1
-Name: dimples
-Version: 1.2.3
-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