dimples 1.6.2__tar.gz → 1.6.4__tar.gz

{dimples-1.6.2 → dimples-1.6.4}/PKG-INFO

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

{dimples-1.6.2 → dimples-1.6.4}/dimples/conn/gatekeeper.py

@@ -31,6 +31,7 @@
 import socket
 import time
 import traceback
+import weakref
 from typing import Optional
 
 from dimsdk import ReliableMessage
@@ -38,7 +39,8 @@ from dimsdk import ReliableMessage
 from startrek.types import SocketAddress
 from startrek import Channel, Hub
 from startrek import BaseChannel
-from startrek import Connection, ConnectionDelegate, BaseConnection
+from startrek import Connection, ConnectionDelegate
+from startrek import BaseConnection, ActiveConnection
 from startrek import Arrival, Departure
 from startrek import Porter, PorterStatus, PorterDelegate
 from startrek import SocketHelper
@@ -88,6 +90,22 @@ class StreamServerHub(ServerHub):
                            remote: SocketAddress, local: Optional[SocketAddress]) -> Optional[Connection]:
         return super()._remove_connection(connection=connection, remote=remote, local=None)
 
+    # Override
+    def _create_connection(self, remote: SocketAddress, local: Optional[SocketAddress]) -> Optional[Connection]:
+        conn = ServerConnection(remote=remote, local=local)
+        conn.delegate = self.delegate  # gate
+        return conn
+
+
+class ServerConnection(BaseConnection):
+
+    # Override
+    async def start(self, hub: Hub):
+        # 1. start state machine
+        await self._start_machine()
+        # 2. open channel via the hub
+        await self._open_channel(hub=hub)
+
 
 class StreamClientHub(ClientHub):
 
@@ -122,6 +140,37 @@ class StreamClientHub(ClientHub):
                            remote: SocketAddress, local: Optional[SocketAddress]) -> Optional[Connection]:
         return super()._remove_connection(connection=connection, remote=remote, local=None)
 
+    # Override
+    def _create_connection(self, remote: SocketAddress, local: Optional[SocketAddress]) -> Optional[Connection]:
+        conn = ClientConnection(remote=remote, local=local)
+        conn.delegate = self.delegate  # gate
+        return conn
+
+
+class ClientConnection(ActiveConnection):
+
+    def __init__(self, remote: SocketAddress, local: Optional[SocketAddress]):
+        super().__init__(remote=remote, local=local)
+        self.__hub_ref = None
+
+    @property  # Override
+    def hub(self) -> Optional[Hub]:
+        ref = self.__hub_ref
+        if ref is not None:
+            return ref()
+
+    # Override
+    async def start(self, hub: Hub):
+        # 1. start state machine
+        await self._start_machine()
+        # 2. open channel via the hub
+        await self._open_channel(hub=hub)
+        # 3. weak reference for the hub
+        self.__hub_ref = weakref.ref(hub)
+        # 4. start an async task to check channel
+        Runner.async_task(coro=self.run())
+        # await self.run()
+
 
 def reset_send_buffer_size(conn: Connection = None, sock: socket.socket = None) -> bool:
     if sock is None:

{dimples-1.6.2 → dimples-1.6.4}/dimples/utils/__init__.py

@@ -64,6 +64,7 @@ from .cache import CachePool, SharedCacheManager
 
 from .http import HttpSession, HttpClient
 
+from .conf_item import IConfig, MessageTransferAgent, Supervisor, NeighborLoader
 from .config import Config
 
 
@@ -147,6 +148,7 @@ __all__ = [
 
     'FrequencyChecker', 'RecentTimeChecker',
 
+    'IConfig', 'MessageTransferAgent', 'Supervisor', 'NeighborLoader',
     'Config',
 
     'is_before',

dimples-1.6.4/dimples/utils/conf_item.py

@@ -0,0 +1,240 @@
+# -*- coding: utf-8 -*-
+# ==============================================================================
+# MIT License
+#
+# Copyright (c) 2026 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.
+# ==============================================================================
+
+import weakref
+from abc import ABC, abstractmethod
+from typing import Optional, Any, Set, List, Dict
+from typing import Iterable
+
+from aiou import JSONFile
+
+from dimsdk import JSON
+from dimsdk import Dictionary
+from dimsdk import EntityType, ID
+from dimsdk import Facebook
+
+from .log import Logging
+from .http import HttpClient
+
+
+class IConfig(ABC):
+
+    @abstractmethod
+    def get_section(self, section: str) -> Optional[Dict]:
+        raise NotImplementedError('NotImplemented')
+
+    @abstractmethod
+    def get_integer(self, section: str, option: str) -> int:
+        raise NotImplementedError('NotImplemented')
+
+    @abstractmethod
+    def get_boolean(self, section: str, option: str) -> bool:
+        raise NotImplementedError('NotImplemented')
+
+    @abstractmethod
+    def get_string(self, section: str, option: str) -> Optional[str]:
+        raise NotImplementedError('NotImplemented')
+
+    @abstractmethod
+    def get_list(self, section: str, option: str, separator: str = ',') -> Optional[List[str]]:
+        raise NotImplementedError('NotImplemented')
+
+
+class MessageTransferAgent(Dictionary):
+    """ DIM Network Node """
+
+    # Override
+    def __str__(self) -> str:
+        clazz = self.__class__.__name__
+        return '<%s host="%s" port=%d id="%s" />' % (clazz, self.host, self.port, self.identifier)
+
+    # Override
+    def __repr__(self) -> str:
+        clazz = self.__class__.__name__
+        return '<%s host="%s" port=%d id="%s" />' % (clazz, self.host, self.port, self.identifier)
+
+    @property
+    def identifier(self) -> Optional[ID]:
+        string = self.get(key='did')
+        if string is None:
+            string = self.get(key='ID')
+        return ID.parse(identifier=string)
+
+    @property
+    def host(self) -> str:
+        return self.get(key='host', default='')
+
+    @property
+    def port(self) -> int:
+        return self.get(key='port', default=0)
+
+    @classmethod
+    def parse(cls, node: Any):
+        if node is None:
+            return None
+        elif isinstance(node, MessageTransferAgent):
+            return node
+        elif isinstance(node, Dictionary):
+            node = node.to_dict()
+        host = node.get('host')
+        port = node.get('port')
+        if host is not None and port is not None and port > 0:
+            return cls(dictionary=node)
+
+    @classmethod
+    def convert(cls, array: Iterable[Any]):
+        stations = []
+        for node in array:
+            item = cls.parse(node=node)
+            if item is not None:
+                stations.append(item)
+        return stations
+
+    @classmethod
+    def revert(cls, stations: Iterable) -> List[Dict]:
+        array = []
+        for node in stations:
+            assert isinstance(node, MessageTransferAgent), 'station node error: %s' % node
+            info = node.to_dict()
+            array.append(info)
+        return array
+
+
+class Supervisor(Logging):
+    """ System Administrators """
+
+    def __init__(self, facebook: Facebook):
+        super().__init__()
+        self.__facebook = weakref.ref(facebook)
+
+    @property
+    def facebook(self) -> Optional[Facebook]:
+        ref = self.__facebook
+        if ref is not None:
+            return ref()
+
+    # noinspection PyMethodMayBeStatic
+    def check_user(self, identifier: ID) -> bool:
+        """ Filter user """
+        return identifier.type == EntityType.USER
+
+    # noinspection PyMethodMayBeStatic
+    def get_identifiers(self, config: IConfig, section: str, option: str) -> List[ID]:
+        """ Get ID list from config """
+        array = config.get_list(section=section, option=option)
+        return [] if array is None else ID.convert(array=array)
+
+    async def get_users(self, config: IConfig, section: str = 'system', option: str = 'supervisors') -> Set[ID]:
+        """ Get system administrators from config """
+        all_users = set()
+        array = self.get_identifiers(config=config, section=section, option=option)
+        if array is None or len(array) == 0:
+            return all_users
+        facebook = self.facebook
+        if facebook is None:
+            # only filter user
+            for item in array:
+                if self.check_user(identifier=item):
+                    all_users.add(item)
+            return all_users
+        # extract group members
+        for item in array:
+            if item.is_user:
+                if self.check_user(identifier=item):
+                    all_users.add(item)
+                continue
+            assert item.is_group, 'group ID error: %s' % item
+            group_members = await facebook.get_members(identifier=item)
+            if group_members is None or len(group_members) == 0:
+                self.warning(msg='failed to get members for group: %s' % item)
+                continue
+            for member in group_members:
+                if self.check_user(identifier=member):
+                    all_users.add(member)
+        return all_users
+
+
+class NeighborLoader(Logging):
+
+    def __init__(self):
+        super().__init__()
+        self.__http = HttpClient()
+
+    async def load_stations(self, config: IConfig) -> Optional[List[MessageTransferAgent]]:
+        # check remote URL
+        source = config.get_string(section='neighbors', option='source')
+        if source is None:
+            stations = None
+        else:
+            stations = await self._download_stations(url=source)
+        # check local path
+        output = config.get_string(section='neighbors', option='output')
+        if output is None:
+            self.warning(msg='neighbors path not set')
+        elif stations is None:
+            stations = await self._load_stations(path=output)
+        else:
+            await self._save_stations(stations=stations, path=output)
+        # OK
+        return stations
+
+    async def _download_stations(self, url: str) -> Optional[List[MessageTransferAgent]]:
+        self.info(msg='downloading stations: %s' % url)
+        http = self.__http
+        try:
+            response = http.cache_get(url=url)
+            if response is None or response.status_code != 200:
+                self.error(msg='failed to get URL: %s response: %s' % (url, response))
+                return None
+            else:
+                text = response.text
+                stations = JSON.decode(string=text)
+        except Exception as error:
+            self.error(msg='failed to download stations: %s, %s' % (error, url))
+            return None
+        if isinstance(stations, Dict):
+            stations = stations.get('stations')
+        if isinstance(stations, List):
+            return MessageTransferAgent.convert(array=stations)
+
+    async def _load_stations(self, path: str) -> Optional[List[MessageTransferAgent]]:
+        self.info(msg='loading stations: %s' % path)
+        try:
+            stations = await JSONFile(path=path).read()
+        except Exception as error:
+            self.error(msg='failed to load stations: %s, %s' % (error, path))
+            return None
+        if isinstance(stations, Dict):
+            stations = stations.get('stations')
+        if isinstance(stations, List):
+            return MessageTransferAgent.convert(array=stations)
+
+    async def _save_stations(self, stations: List[MessageTransferAgent], path: str) -> bool:
+        info = MessageTransferAgent.revert(stations=stations)
+        self.info(msg='saving %d station(s): %s' % (len(stations), path))
+        try:
+            return await JSONFile(path=path).write(info)
+        except Exception as error:
+            self.error(msg='failed to save stations: %s, %s' % (error, path))

{dimples-1.6.2 → dimples-1.6.4}/dimples/utils/config.py

@@ -24,83 +24,20 @@
 # ==============================================================================
 
 from configparser import ConfigParser
-from typing import Optional, Any, List, Dict
-from typing import Iterable
+from typing import Optional, List, Dict
 
-from aiou import JSONFile
 from aiou import RedisConnector
 
-from dimsdk import JSON
-from dimsdk import Dictionary
 from dimsdk import ID
-from dimsdk import Facebook
 
 from .log import Log, Logging
-from .http import HttpClient
-
-
-class MessageTransferAgent(Dictionary):
-    """ DIM Network Node """
-
-    # Override
-    def __str__(self) -> str:
-        clazz = self.__class__.__name__
-        return '<%s host="%s" port=%d id="%s" />' % (clazz, self.host, self.port, self.identifier)
-
-    # Override
-    def __repr__(self) -> str:
-        clazz = self.__class__.__name__
-        return '<%s host="%s" port=%d id="%s" />' % (clazz, self.host, self.port, self.identifier)
-
-    @property
-    def identifier(self) -> Optional[ID]:
-        string = self.get(key='did')
-        if string is None:
-            string = self.get(key='ID')
-        return ID.parse(identifier=string)
-
-    @property
-    def host(self) -> str:
-        return self.get(key='host', default='')
-
-    @property
-    def port(self) -> int:
-        return self.get(key='port', default=0)
-
-    @classmethod
-    def parse(cls, node: Any):
-        if node is None:
-            return None
-        elif isinstance(node, MessageTransferAgent):
-            return node
-        elif isinstance(node, Dictionary):
-            node = node.to_dict()
-        host = node.get('host')
-        port = node.get('port')
-        if host is not None and port is not None and port > 0:
-            return cls(dictionary=node)
-
-    @classmethod
-    def convert(cls, array: Iterable[Any]):
-        stations = []
-        for node in array:
-            item = cls.parse(node=node)
-            if item is not None:
-                stations.append(item)
-        return stations
-
-    @classmethod
-    def revert(cls, stations: Iterable) -> List[Dict]:
-        array = []
-        for node in stations:
-            assert isinstance(node, MessageTransferAgent), 'station node error: %s' % node
-            info = node.to_dict()
-            array.append(info)
-        return array
+from .conf_item import IConfig
+from .conf_item import MessageTransferAgent
+from .conf_item import NeighborLoader
 
 
 # @Singleton
-class Config(Logging):
+class Config(IConfig, Logging):
     """ Config info from ini file """
 
     def __init__(self):
@@ -149,11 +86,13 @@ class Config(Logging):
     def __repr__(self) -> str:
         return 'Config: %s' % self.to_dict()
 
+    # Override
     def get_section(self, section: str) -> Optional[Dict]:
         parser = self.__parser
         if parser is not None:
             return _section_options(parser=parser, section=section)
 
+    # Override
     def get_integer(self, section: str, option: str) -> int:
         parser = self.__parser
         if parser is None:
@@ -164,6 +103,7 @@ class Config(Logging):
             self.error(msg='failed to get integer: %s, %s, %s' % (section, option, error))
             return 0
 
+    # Override
     def get_boolean(self, section: str, option: str) -> bool:
         parser = self.__parser
         if parser is None:
@@ -173,6 +113,7 @@ class Config(Logging):
         except Exception as error:
             self.error(msg='failed to get boolean: %s, %s, %s' % (section, option, error))
 
+    # Override
     def get_string(self, section: str, option: str) -> Optional[str]:
         parser = self.__parser
         if parser is None:
@@ -182,15 +123,12 @@ class Config(Logging):
         except Exception as error:
             self.error(msg='failed to get string : %s, %s, %s' % (section, option, error))
 
-    def get_identifier(self, section: str, option: str) -> Optional[ID]:
-        value = self.get_string(section=section, option=option)
-        return ID.parse(identifier=value)
-
-    def get_list(self, section: str, option: str, separator: str = ',') -> List[str]:
+    # Override
+    def get_list(self, section: str, option: str, separator: str = ',') -> Optional[List[str]]:
         """ get str and separate to a list """
         text = self.get_string(section=section, option=option)
         if text is None:
-            return []
+            return None
         result = []
         array = text.split(separator)
         for item in array:
@@ -199,36 +137,9 @@ class Config(Logging):
                 result.append(string)
         return result
 
-    #
-    #   ID list
-    #
-
-    def get_identifiers(self, section: str, option: str) -> List[ID]:
-        array = self.get_list(section=section, option=option)
-        return ID.convert(array=array)
-
-    async def get_users(self, section: str, option: str, facebook: Facebook) -> List[ID]:
-        users = []
-        array = self.get_identifiers(section=section, option=option)
-        for item in array:
-            if item.is_user:
-                if item not in users:
-                    users.append(item)
-                continue
-            # extract group members
-            members = await facebook.get_members(identifier=item)
-            for usr in members:
-                if usr not in users:
-                    users.append(usr)
-        return users
-
-    async def get_supervisors(self, section: str = 'admin', option: str = 'supervisors',
-                              facebook: Facebook = None) -> List[ID]:
-        """ extract group members when facebook available """
-        if facebook is None:
-            return self.get_identifiers(section=section, option=option)
-        else:
-            return await self.get_users(section=section, option=option, facebook=facebook)
+    def get_identifier(self, section: str, option: str) -> Optional[ID]:
+        value = self.get_string(section=section, option=option)
+        return ID.parse(identifier=value)
 
     #
     #   database
@@ -339,70 +250,6 @@ class Config(Logging):
         return neighbor_stations
 
 
-class NeighborLoader(Logging):
-
-    def __init__(self):
-        super().__init__()
-        self.__http = HttpClient()
-
-    async def load_stations(self, config: Config) -> Optional[List[MessageTransferAgent]]:
-        # check remote URL
-        source = config.get_string(section='neighbors', option='source')
-        if source is None:
-            stations = None
-        else:
-            stations = await self._download_stations(url=source)
-        # check local path
-        output = config.get_string(section='neighbors', option='output')
-        if output is None:
-            self.warning(msg='neighbors path not set')
-        elif stations is None:
-            stations = await self._load_stations(path=output)
-        else:
-            await self._save_stations(stations=stations, path=output)
-        # OK
-        return stations
-
-    async def _download_stations(self, url: str) -> Optional[List[MessageTransferAgent]]:
-        self.info(msg='downloading stations: %s' % url)
-        http = self.__http
-        try:
-            response = http.cache_get(url=url)
-            if response is None or response.status_code != 200:
-                self.error(msg='failed to get URL: %s response: %s' % (url, response))
-                return None
-            else:
-                text = response.text
-                stations = JSON.decode(string=text)
-        except Exception as error:
-            self.error(msg='failed to download stations: %s, %s' % (error, url))
-            return None
-        if isinstance(stations, Dict):
-            stations = stations.get('stations')
-        if isinstance(stations, List):
-            return MessageTransferAgent.convert(array=stations)
-
-    async def _load_stations(self, path: str) -> Optional[List[MessageTransferAgent]]:
-        self.info(msg='loading stations: %s' % path)
-        try:
-            stations = await JSONFile(path=path).read()
-        except Exception as error:
-            self.error(msg='failed to load stations: %s, %s' % (error, path))
-            return None
-        if isinstance(stations, Dict):
-            stations = stations.get('stations')
-        if isinstance(stations, List):
-            return MessageTransferAgent.convert(array=stations)
-
-    async def _save_stations(self, stations: List[MessageTransferAgent], path: str) -> bool:
-        info = MessageTransferAgent.revert(stations=stations)
-        self.info(msg='saving %d station(s): %s' % (len(stations), path))
-        try:
-            return await JSONFile(path=path).write(info)
-        except Exception as error:
-            self.error(msg='failed to save stations: %s, %s' % (error, path))
-
-
 def _update_sections(info: Dict, parser: ConfigParser) -> Dict:
     sections = parser.sections()
     for name in sections:

{dimples-1.6.2 → dimples-1.6.4}/dimples.egg-info/PKG-INFO

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

{dimples-1.6.2 → dimples-1.6.4}/dimples.egg-info/SOURCES.txt

@@ -179,6 +179,7 @@ dimples/station/start.py
 dimples/utils/__init__.py
 dimples/utils/cache.py
 dimples/utils/checker.py
+dimples/utils/conf_item.py
 dimples/utils/config.py
 dimples/utils/digest.py
 dimples/utils/http.py

{dimples-1.6.2 → dimples-1.6.4}/setup.py

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