dimples 1.2.6__tar.gz → 1.2.8__tar.gz

{dimples-1.2.6 → dimples-1.2.8}/PKG-INFO

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

{dimples-1.2.6 → dimples-1.2.8}/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.8}/dimples/conn/gate.py

@@ -29,7 +29,6 @@
 # ==============================================================================
 
 import socket
-import threading
 from abc import ABC
 from typing import Generic, TypeVar, Optional, Union
 
@@ -38,7 +37,7 @@ from startrek.net.state import StateOrder
 from startrek import Hub
 from startrek import Connection, ConnectionState, ActiveConnection
 from startrek import Porter, PorterStatus, PorterDelegate
-from startrek import Arrival, StarPorter, StarGate
+from startrek import Arrival, StarGate
 
 from ..utils import Logging
 
@@ -57,7 +56,6 @@ class CommonGate(StarGate, Logging, Generic[H], ABC):
     def __init__(self, delegate: PorterDelegate):
         super().__init__(delegate=delegate)
         self.__hub: H = None
-        self.__lock = threading.Lock()
 
     @property
     def hub(self) -> H:
@@ -92,29 +90,15 @@ class CommonGate(StarGate, Logging, Generic[H], ABC):
         else:
             return docker.status
 
-    async def fetch_porter(self, remote: SocketAddress, local: Optional[SocketAddress]) -> Porter:
-        # try to get docker
-        with self.__lock:
-            old = self._get_porter(remote=remote, local=local)
-            if old is None:
-                # create & cache docker
-                worker = self._create_porter(remote=remote, local=local)
-                self._set_porter(worker, remote=remote, local=local)
-            else:
-                worker = old
-        if old is None:
-            hub = self.hub
-            assert isinstance(hub, Hub), 'gate hub error: %s' % hub
-            conn = await hub.connect(remote=remote, local=local)
-            if conn is None:
-                # assert False, 'failed to get connection: %s -> %s' % (local, remote)
-                self._remove_porter(worker, remote=remote, local=local)
-                worker = None
-            else:
-                assert isinstance(worker, StarPorter), 'docker error: %s, %s' % (remote, worker)
-                # set connection for this docker
-                await worker.set_connection(conn)
-        return worker
+    async def fetch_porter(self, remote: SocketAddress, local: Optional[SocketAddress]) -> Optional[Porter]:
+        # get connection from hub
+        hub = self.hub
+        assert isinstance(hub, Hub), 'gate hub error: %s' % hub
+        conn = await hub.connect(remote=remote, local=local)
+        if conn is not None:
+            # connected, get docker with this connection
+            return await self._dock(connection=conn, create_porter=True)
+        assert False, 'failed to get connection: %s -> %s' % (local, remote)
 
     async def send_response(self, payload: bytes, ship: Arrival,
                             remote: SocketAddress, local: Optional[SocketAddress]) -> bool:

{dimples-1.2.6 → dimples-1.2.8}/dimples/conn/ws.py

@@ -61,7 +61,9 @@ class WSArrival(ArrivalShip):
 
     @property  # Override
     def sn(self) -> bytes:
-        return self.__payload
+        data = self.__payload
+        sn = _fetch_sig_or_time(data=data)
+        return data if sn is None else sn
 
     # Override
     def assemble(self, ship):
@@ -71,11 +73,12 @@ class WSArrival(ArrivalShip):
 
 class WSDeparture(DepartureShip):
 
-    def __init__(self, package: bytes, payload: bytes, priority: int = 0):
+    def __init__(self, package: bytes, payload: bytes, priority: int = 0, important: bool = False):
         super().__init__(priority=priority, max_tries=1)
         self.__fragments = [package]
         self.__package = package
         self.__payload = payload
+        self.__important = important
 
     @property
     def package(self) -> bytes:
@@ -87,7 +90,9 @@ class WSDeparture(DepartureShip):
 
     @property  # Override
     def sn(self) -> bytes:
-        return self.__payload
+        data = self.__payload
+        sn = _fetch_sig_or_time(data=data)
+        return data if sn is None else sn
 
     @property  # Override
     def fragments(self) -> List[bytes]:
@@ -102,7 +107,42 @@ class WSDeparture(DepartureShip):
 
     @property
     def is_important(self) -> bool:
-        return False
+        return self.__important
+
+
+def _fetch_sig_or_time(data: bytes) -> Optional[bytes]:
+    sn = _fetch_value(data=data, tag=b'signature')
+    if sn is None:
+        sn = _fetch_value(data=data, tag=b'time')
+    return sn
+
+
+def _fetch_value(data: bytes, tag: bytes) -> Optional[bytes]:
+    tag_len = len(tag)
+    if tag_len == 0:
+        return None
+    # search tag
+    pos = data.find(tag)
+    if pos < 0:
+        return None
+    else:
+        pos += tag_len
+    # skip to start of value
+    pos = data.find(b':', pos)
+    if pos < 0:
+        return None
+    else:
+        pos += 1
+    # find end value
+    end = data.find(b',', pos)
+    if end < 0:
+        end = data.find(b'}', pos)
+        if end < 0:
+            return None
+    value = data[pos:end]
+    value = value.strip(b'"')
+    value = value.strip(b"'")
+    return value
 
 
 class WSPorter(PlainPorter, DeparturePacker):
@@ -116,6 +156,7 @@ class WSPorter(PlainPorter, DeparturePacker):
         self.__chunks = b''
         self.__chunks_lock = threading.RLock()
         self.__package_received = False
+        self.__ack_enable = False
 
     def _parse_package(self, data: bytes) -> Tuple[Optional[bytes], Optional[bytes], int]:
         conn = self.connection
@@ -208,6 +249,11 @@ class WSPorter(PlainPorter, DeparturePacker):
         elif body == OK:
             # should not happen
             return None
+        if body.startswith(b'ACK:'):
+            # respond for message
+            await self._check_response(ship=ship)
+            self.__ack_enable = True
+            return None
         # NOTICE: the delegate must respond to client in current request,
         #         cause it's a HTTP connection
         return ship
@@ -220,7 +266,8 @@ class WSPorter(PlainPorter, DeparturePacker):
     # Override
     def pack(self, payload: bytes, priority: int = 0) -> Optional[Departure]:
         req_pack = WebSocket.pack(payload=payload)
-        return WSDeparture(package=req_pack, payload=payload, priority=priority)
+        important = self.__ack_enable
+        return WSDeparture(package=req_pack, payload=payload, priority=priority, important=important)
 
     @classmethod
     def check(cls, data: bytes) -> bool:

{dimples-1.2.6 → dimples-1.2.8}/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.8}/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.8}/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.8}/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.6 → dimples-1.2.8}/dimples.egg-info/PKG-INFO

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

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

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