dimples 1.2.4__tar.gz → 1.2.6__tar.gz

dimples-1.2.6/PKG-INFO

@@ -0,0 +1,22 @@
+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.4 → dimples-1.2.6}/dimples/client/network/session.py

@@ -40,7 +40,7 @@ from typing import Optional, List
 
 from dimsdk import Station
 
-from startrek import Docker, DockerStatus
+from startrek import Porter, PorterStatus
 from startrek import Arrival
 
 from ...utils import Daemon, Runner
@@ -146,20 +146,20 @@ class ClientSession(BaseSession):
     #
 
     # Override
-    async def docker_status_changed(self, previous: DockerStatus, current: DockerStatus, docker: Docker):
-        # await super().docker_status_changed(previous=previous, current=current, docker=docker)
-        if current is None or current == DockerStatus.ERROR:
+    async def porter_status_changed(self, previous: PorterStatus, current: PorterStatus, porter: Porter):
+        # await super().porter_status_changed(previous=previous, current=current, porter=porter)
+        if current is None or current == PorterStatus.ERROR:
             # connection error or session finished
             self.set_active(active=False)
-            self.warning(msg='connection lost, waiting for reconnecting: %s' % docker)
+            self.warning(msg='connection lost, waiting for reconnecting: %s' % porter)
             # TODO: clear session ID and handshake again
-        elif current == DockerStatus.READY:
+        elif current == PorterStatus.READY:
             # connected/reconnected
             self.set_active(active=True)
 
     # Override
-    async def docker_received(self, ship: Arrival, docker: Docker):
-        # await super().docker_received(ship=ship, docker=docker)
+    async def porter_received(self, ship: Arrival, porter: Porter):
+        # await super().porter_received(ship=ship, porter=porter)
         all_responses = []
         messenger = self.messenger
         # 1. get data packages from arrival ship's payload
@@ -174,14 +174,14 @@ class ClientSession(BaseSession):
                         continue
                     all_responses.append(res)
             except Exception as error:
-                source = docker.remote_address
+                source = porter.remote_address
                 self.error(msg='parse message failed (%s): %s, %s' % (source, error, pack))
                 traceback.print_exc()
                 # from dimsdk import TextContent
                 # return TextContent.new(text='parse message failed: %s' % error)
         gate = self.gate
-        source = docker.remote_address
-        destination = docker.local_address
+        source = porter.remote_address
+        destination = porter.local_address
         # 3. send responses separately
         for res in all_responses:
             await gate.send_response(payload=res, ship=ship, remote=source, local=destination)

{dimples-1.2.4 → dimples-1.2.6}/dimples/client/network/state.py

@@ -33,7 +33,7 @@ from dimsdk import ID
 
 from startrek.skywalker import Runner
 from startrek.fsm import Context, BaseTransition, BaseState, AutoMachine
-from startrek import Docker, DockerStatus
+from startrek import Porter, PorterStatus
 
 # from .session import ClientSession
 
@@ -43,7 +43,7 @@ class StateMachine(AutoMachine, Context):
     def __init__(self, session):
         super().__init__()
         self.__session = weakref.ref(session)
-        self.__docker_ref = None
+        self.__porter_ref = None
         # init states
         builder = self._create_state_builder()
         self.add_state(state=builder.get_default_state())
@@ -58,17 +58,17 @@ class StateMachine(AutoMachine, Context):
         return self.__session()
 
     @property
-    def docker(self) -> Optional[Docker]:
-        ref = self.__docker_ref
+    def porter(self) -> Optional[Porter]:
+        ref = self.__porter_ref
         if ref is not None:
             return ref()
 
-    @docker.setter
-    def docker(self, worker: Docker):
-        if worker is None:
-            self.__docker_ref = None
+    @porter.setter
+    def porter(self, docker: Porter):
+        if docker is None:
+            self.__porter_ref = None
         else:
-            self.__docker_ref = weakref.ref(worker)
+            self.__porter_ref = weakref.ref(docker)
 
     # noinspection PyMethodMayBeStatic
     def _create_state_builder(self):
@@ -90,21 +90,21 @@ class StateMachine(AutoMachine, Context):
         return session.identifier
 
     @property
-    def status(self) -> DockerStatus:
-        docker = self.docker
+    def status(self) -> PorterStatus:
+        docker = self.porter
         if docker is not None:
             return docker.status
         else:
             session = self.session
             gate = session.gate
-            coro = gate.fetch_docker([], remote=session.remote_address, local=None)
+            coro = gate.fetch_porter(remote=session.remote_address, local=None)
             task = Runner.async_task(coro=coro)
-            task.add_done_callback(self._fetch_docker_callback)
+            task.add_done_callback(self._fetch_porter_callback)
         # waiting for callback
-        return DockerStatus.ERROR
+        return PorterStatus.ERROR
 
-    def _fetch_docker_callback(self, t: asyncio.Task):
-        self.docker = t.result()
+    def _fetch_porter_callback(self, t: asyncio.Task):
+        self.porter = t.result()
 
 
 class StateOrder(IntEnum):

{dimples-1.2.4 → dimples-1.2.6}/dimples/client/network/transition.py

@@ -23,7 +23,7 @@
 # SOFTWARE.
 # ==============================================================================
 
-from startrek import DockerStatus
+from startrek import PorterStatus
 
 from .state import StateMachine, StateTransition
 from .state import StateOrder
@@ -106,7 +106,7 @@ class DefaultConnectingTransition(StateTransition):
         if ctx.session_id is None:
             # current user not set yet
             return False
-        return ctx.status in [DockerStatus.PREPARING, DockerStatus.READY]
+        return ctx.status in [PorterStatus.PREPARING, PorterStatus.READY]
 
 
 class ConnectingConnectedTransition(StateTransition):
@@ -122,7 +122,7 @@ class ConnectingConnectedTransition(StateTransition):
     def evaluate(self, ctx: StateMachine, now: float) -> bool:
         # assert ctx.session_key is None, 'session key must be empty before handshaking'
         # assert ctx.session_id is not None, 'current user lost?'
-        return ctx.status == DockerStatus.READY
+        return ctx.status == PorterStatus.READY
 
 
 class ConnectingErrorTransition(StateTransition):
@@ -141,7 +141,7 @@ class ConnectingErrorTransition(StateTransition):
         if self.is_expired(state=ctx.current_state, now=now):
             # connecting expired, do it again
             return True
-        return ctx.status not in [DockerStatus.PREPARING, DockerStatus.READY]
+        return ctx.status not in [PorterStatus.PREPARING, PorterStatus.READY]
 
 
 class ConnectedHandshakingTransition(StateTransition):
@@ -159,7 +159,7 @@ class ConnectedHandshakingTransition(StateTransition):
             # FIXME: current user lost?
             #        state will be changed to 'error'
             return False
-        return ctx.status == DockerStatus.READY
+        return ctx.status == PorterStatus.READY
 
 
 class ConnectedErrorTransition(StateTransition):
@@ -176,7 +176,7 @@ class ConnectedErrorTransition(StateTransition):
         if ctx.session_id is None:
             # FIXME: current user lost?
             return True
-        return ctx.status != DockerStatus.READY
+        return ctx.status != PorterStatus.READY
 
 
 class HandshakingRunningTransition(StateTransition):
@@ -194,7 +194,7 @@ class HandshakingRunningTransition(StateTransition):
             # FIXME: current user lost?
             #        state will be changed to 'error'
             return False
-        if ctx.status != DockerStatus.READY:
+        if ctx.status != PorterStatus.READY:
             # connection lost, state will be changed to 'error'
             return False
         # when current user changed, the session key will cleared, so
@@ -217,7 +217,7 @@ class HandshakingConnectedTransition(StateTransition):
             # FIXME: current user lost?
             #        state will be changed to 'error'
             return False
-        if ctx.status != DockerStatus.READY:
+        if ctx.status != PorterStatus.READY:
             # connection lost, state will be changed to 'error'
             return False
         if ctx.session_key is not None:
@@ -241,7 +241,7 @@ class HandshakingErrorTransition(StateTransition):
         if ctx.session_id is None:
             # FIXME: current user lost?
             return True
-        return ctx.status != DockerStatus.READY
+        return ctx.status != PorterStatus.READY
 
 
 class RunningDefaultTransition(StateTransition):
@@ -258,7 +258,7 @@ class RunningDefaultTransition(StateTransition):
 
     # Override
     def evaluate(self, ctx: StateMachine, now: float) -> bool:
-        if ctx.status != DockerStatus.READY:
+        if ctx.status != PorterStatus.READY:
             # connection lost, state will be changed to 'error'
             return False
         if ctx.session_id is None:
@@ -277,7 +277,7 @@ class RunningErrorTransition(StateTransition):
 
     # Override
     def evaluate(self, ctx: StateMachine, now: float) -> bool:
-        return ctx.status != DockerStatus.READY
+        return ctx.status != PorterStatus.READY
 
 
 class ErrorDefaultTransition(StateTransition):
@@ -289,4 +289,4 @@ class ErrorDefaultTransition(StateTransition):
 
     # Override
     def evaluate(self, ctx: StateMachine, now: float) -> bool:
-        return ctx.status != DockerStatus.ERROR
+        return ctx.status != PorterStatus.ERROR

{dimples-1.2.4 → dimples-1.2.6}/dimples/client/processor.py

@@ -28,7 +28,6 @@
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 """
 
-import time
 from typing import List
 
 from dimsdk import DateTime
@@ -120,14 +119,12 @@ class ClientMessageProcessor(CommonMessageProcessor):
             elif isinstance(res, ReceiptCommand):
                 if sender.type == EntityType.STATION or sender.type == EntityType.BOT:
                     # no need to respond receipt to station
-                    when = time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(r_msg.time))
-                    self.info(msg='drop receipt responding to %s, origin msg time=[%s]' % (sender, when))
+                    self.info(msg='drop receipt to %s, origin msg time=[%s]' % (sender, r_msg.time))
                     continue
             elif isinstance(res, TextContent):
                 if sender.type == EntityType.STATION or sender.type == EntityType.BOT:
                     # no need to respond text message to station
-                    when = time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(r_msg.time))
-                    self.info(msg='drop text responding to %s, origin time=[%s], text=%s' % (sender, when, res.text))
+                    self.info(msg='drop text to %s, origin time=[%s], text=%s' % (sender, r_msg.time, res.text))
                     continue
             # normal response
             await messenger.send_content(sender=receiver, receiver=sender, content=res)

{dimples-1.2.4 → dimples-1.2.6}/dimples/conn/__init__.py

@@ -29,12 +29,12 @@
 
         +--------------+
         |   Facebook   |
-        +--------------+         DockerDelegate      ConnectionDelegate
+        +--------------+         PorterDelegate      ConnectionDelegate
               :  AccountDB      +--------------+        +----------+
               :                 |  GateKeeper  | . . . >|   Gate   |
         +--------------+        +--------------+        +----------+
         |   Messenger  | . . . >|   Session    |            Hub (Connection)
-        +--------------+        +--------------+            Docker
+        +--------------+        +--------------+            Porter
                  MessageDB               SessionDB
                  Filter
                  Dispatcher
@@ -46,24 +46,24 @@ from startrek import BaseChannel, ChannelReader, ChannelWriter
 from startrek import BaseHub, BaseConnection, ActiveConnection
 
 from startrek import Ship, Arrival, Departure, DeparturePriority
-from startrek import Docker, DockerStatus, DockerDelegate, Gate
+from startrek import Porter, PorterStatus, PorterDelegate, Gate
 from startrek import ArrivalShip, ArrivalHall, DepartureShip, DepartureHall
-from startrek import Dock, LockedDock, StarDocker, StarGate
+from startrek import Dock, LockedDock, StarPorter, StarGate
 
-from tcp import PlainArrival, PlainDeparture, PlainDocker
+from tcp import PlainArrival, PlainDeparture, PlainPorter
 from tcp import StreamChannel, StreamHub
 from tcp import ServerHub as TCPServerHub, ClientHub as TCPClientHub
 
-from udp import PackageArrival, PackageDeparture, PackageDocker
+from udp import PackageArrival, PackageDeparture, PackagePorter
 from udp import PacketChannel, PacketHub
 from udp import ServerHub as UDPServerHub, ClientHub as UDPClientHub
 
 from .protocol import WebSocket, NetMsg, NetMsgHead, NetMsgSeq
 
-from .ws import WSArrival, WSDeparture, WSDocker
-from .mars import MarsStreamArrival, MarsStreamDeparture, MarsStreamDocker
-from .mtp import MTPStreamArrival, MTPStreamDeparture, MTPStreamDocker
-from .flexible import FlexibleDocker
+from .ws import WSArrival, WSDeparture, WSPorter
+from .mars import MarsStreamArrival, MarsStreamDeparture, MarsStreamPorter
+from .mtp import MTPStreamArrival, MTPStreamDeparture, MTPStreamPorter
+from .flexible import FlexiblePorter
 from .gate import CommonGate, TCPServerGate, TCPClientGate, UDPServerGate, UDPClientGate
 # from .gatekeeper import GateKeeper
 from .queue import MessageWrapper, MessageQueue
@@ -81,20 +81,20 @@ __all__ = [
     'BaseHub', 'BaseConnection', 'ActiveConnection',
 
     'Ship', 'Arrival', 'Departure', 'DeparturePriority',
-    'Docker', 'DockerStatus', 'DockerDelegate', 'Gate',
+    'Porter', 'PorterStatus', 'PorterDelegate', 'Gate',
     'ArrivalShip', 'ArrivalHall', 'DepartureShip', 'DepartureHall',
-    'Dock', 'LockedDock', 'StarDocker', 'StarGate',
+    'Dock', 'LockedDock', 'StarPorter', 'StarGate',
 
     #
     #   TCP
     #
-    'PlainArrival', 'PlainDeparture', 'PlainDocker',
+    'PlainArrival', 'PlainDeparture', 'PlainPorter',
     'StreamChannel', 'StreamHub', 'TCPServerHub', 'TCPClientHub',
 
     #
     #   UDP
     #
-    'PackageArrival', 'PackageDeparture', 'PackageDocker',
+    'PackageArrival', 'PackageDeparture', 'PackagePorter',
     'PacketChannel', 'PacketHub', 'UDPServerHub', 'UDPClientHub',
 
     #
@@ -105,10 +105,10 @@ __all__ = [
     #
     #   Network
     #
-    'WSArrival', 'WSDeparture', 'WSDocker',
-    'MarsStreamArrival', 'MarsStreamDeparture', 'MarsStreamDocker',
-    'MTPStreamArrival', 'MTPStreamDeparture', 'MTPStreamDocker',
-    'FlexibleDocker',
+    'WSArrival', 'WSDeparture', 'WSPorter',
+    'MarsStreamArrival', 'MarsStreamDeparture', 'MarsStreamPorter',
+    'MTPStreamArrival', 'MTPStreamDeparture', 'MTPStreamPorter',
+    'FlexiblePorter',
     'CommonGate', 'TCPServerGate', 'TCPClientGate', 'UDPServerGate', 'UDPClientGate',
     # 'GateKeeper',
     'MessageWrapper', 'MessageQueue',

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

@@ -34,47 +34,26 @@ from startrek.types import SocketAddress
 from startrek.skywalker import Runner
 from startrek import Connection
 from startrek import Arrival, Departure
-from startrek import StarDocker
+from startrek import StarPorter
 
 from ..utils import Logging
 from .protocol import DeparturePacker
 
-from .ws import WSDocker
-from .mtp import MTPStreamDocker, TransactionID, MTPHelper
-from .mars import MarsStreamDocker, MarsHelper
+from .ws import WSPorter
+from .mtp import MTPStreamPorter, TransactionID, MTPHelper
+from .mars import MarsStreamPorter, MarsHelper
 
 
-class FlexibleDocker(StarDocker, DeparturePacker, Logging):
+class FlexiblePorter(StarPorter, DeparturePacker, Logging):
 
     def __init__(self, remote: SocketAddress, local: Optional[SocketAddress]):
         super().__init__(remote=remote, local=local)
-        self.__docker: Optional[StarDocker] = None
-
-    def _get_docker(self, data: bytes) -> Optional[StarDocker]:
-        docker = self.__docker
-        if docker is not None or len(data) == 0:
-            return docker
-        # check data for packer
-        if WSDocker.check(data=data):
-            docker = WSDocker(remote=self.remote_address, local=self.local_address)
-        elif MTPStreamDocker.check(data=data):
-            docker = MTPStreamDocker(remote=self.remote_address, local=self.local_address)
-        elif MarsStreamDocker.check(data=data):
-            docker = MarsStreamDocker(remote=self.remote_address, local=self.local_address)
-        else:
-            self.error(msg='unsupported data format: %s' % data)
-            return None
-        # OK
-        docker.delegate = self.delegate
-        coro = docker.set_connection(conn=self.connection)
-        Runner.async_task(coro=coro)
-        self.__docker = docker
-        return docker
+        self.__porter: Optional[StarPorter] = None
 
     # Override
     async def set_connection(self, conn: Optional[Connection]):
         await super().set_connection(conn=conn)
-        docker = self.__docker
+        docker = self.__porter
         if docker is None:
             self.error(msg='docker not ready, failed to set connection: %s' % conn)
         else:
@@ -82,7 +61,7 @@ class FlexibleDocker(StarDocker, DeparturePacker, Logging):
 
     # Override
     async def send_ship(self, ship: Departure) -> bool:
-        docker = self.__docker
+        docker = self.__porter
         if docker is None:
             self.error(msg='docker not ready, failed to send ship: %s' % ship)
             return False
@@ -91,11 +70,28 @@ class FlexibleDocker(StarDocker, DeparturePacker, Logging):
 
     # Override
     async def process_received(self, data: bytes):
-        docker = self._get_docker(data=data)
+        docker = self.__porter
         if docker is None:
-            self.error(msg='docker not ready, failed to process received: %s' % data)
-        else:
-            return await docker.process_received(data=data)
+            # check data for packer
+            if WSPorter.check(data=data):
+                docker = WSPorter(remote=self.remote_address, local=self.local_address)
+            elif MTPStreamPorter.check(data=data):
+                docker = MTPStreamPorter(remote=self.remote_address, local=self.local_address)
+            elif MarsStreamPorter.check(data=data):
+                docker = MarsStreamPorter(remote=self.remote_address, local=self.local_address)
+            else:
+                self.error(msg='unsupported data format: %s' % data)
+                return None
+            # initialize
+            docker.delegate = self.delegate
+            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)
 
     # Override
     def _get_arrivals(self, data: bytes) -> List[Arrival]:
@@ -120,47 +116,49 @@ class FlexibleDocker(StarDocker, DeparturePacker, Logging):
     # Override
     def purge(self, now: float = 0) -> int:
         cnt = super().purge(now=now)
-        docker = self.__docker
+        docker = self.__porter
         if docker is None:
-            self.warning(msg='docker not ready, failed to purge')
+            self.debug(msg='docker not ready, failed to purge')
         else:
             cnt += docker.purge(now=now)
         return cnt
 
     # Override
     async def close(self):
-        await self.set_connection(conn=None)
-        docker = self.__docker
-        if docker is not None:
-            self.__docker = None
+        await super().set_connection(conn=None)
+        docker = self.__porter
+        if docker is None:
+            self.warning(msg='docker not ready, failed to close')
+        else:
+            self.__porter = None
             await docker.close()
 
     # Override
     async def process(self) -> bool:
-        docker = self.__docker
+        docker = self.__porter
         if docker is None:
-            self.warning(msg='docker not ready, failed to process')
+            self.debug(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
+        docker = self.__porter
         if docker is None:
             self.error(msg='docker not ready, failed to send payload: %s' % payload)
             return False
-        elif isinstance(docker, WSDocker):
+        elif isinstance(docker, WSPorter):
             ship = docker.pack(payload=payload)
             return await docker.send_ship(ship=ship)
-        elif isinstance(docker, MTPStreamDocker):
+        elif isinstance(docker, MTPStreamPorter):
             # sn = TransactionID.from_data(data=ship.sn)
             sn = TransactionID.generate()
             pack = MTPHelper.create_message(body=payload, sn=sn)
             return await docker.send_package(pack=pack)
-        elif isinstance(docker, MarsStreamDocker):
+        elif isinstance(docker, MarsStreamPorter):
             mars = MarsHelper.create_push(payload=payload)
-            ship = MarsStreamDocker.create_departure(mars=mars)
+            ship = MarsStreamPorter.create_departure(mars=mars)
             return await docker.send_ship(ship=ship)
         else:
             # error
@@ -168,7 +166,7 @@ class FlexibleDocker(StarDocker, DeparturePacker, Logging):
 
     # Override
     async def heartbeat(self):
-        docker = self.__docker
+        docker = self.__porter
         if docker is None:
             self.warning(msg='docker not ready, failed to heart bet')
         else:
@@ -176,7 +174,7 @@ class FlexibleDocker(StarDocker, DeparturePacker, Logging):
 
     # Override
     def pack(self, payload: bytes, priority: int = 0) -> Optional[Departure]:
-        docker = self.__docker
+        docker = self.__porter
         if docker is None:
             self.error(msg='docker not ready, failed to pack: %s' % payload)
             return None